diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:43:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:43:28 -0800 |
| commit | 2edefe38a813deb4dfbd62dcf47520aeb1af15fc (patch) | |
| tree | eb3b241d33eb2abda586b947825a7d1cf5f1ca6a /diff.c | |
| parent | ddebfd1f27110bbcd0e8da0417bc425509af219a (diff) | |
| parent | fb700cb0679e22900f0d1435641e6cf7c652968b (diff) | |
| download | git-2edefe38a813deb4dfbd62dcf47520aeb1af15fc.tar.gz | |
Merge branch 'jg/mergetool'
* jg/mergetool:
mergetool: Don't repeat merge tool candidates
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions