![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 1 Feb 2009 01:43:28 +0000 (17:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 1 Feb 2009 01:43:28 +0000 (17:43 -0800) | ||
| commit | 2edefe38a813deb4dfbd62dcf47520aeb1af15fc | |
| tree | eb3b241d33eb2abda586b947825a7d1cf5f1ca6a | tree | snapshot |
| parent | ddebfd1f27110bbcd0e8da0417bc425509af219a | commit | diff |
| parent | fb700cb0679e22900f0d1435641e6cf7c652968b | commit | diff |
Merge branch 'jg/mergetool'
* jg/mergetool:
mergetool: Don't repeat merge tool candidates
* jg/mergetool:
mergetool: Don't repeat merge tool candidates