Merge branch 'jg/mergetool'
commit2edefe38a813deb4dfbd62dcf47520aeb1af15fc
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:43:28 +0000 (31 17:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:43:28 +0000 (31 17:43 -0800)
treeeb3b241d33eb2abda586b947825a7d1cf5f1ca6a
parentddebfd1f27110bbcd0e8da0417bc425509af219a
parentfb700cb0679e22900f0d1435641e6cf7c652968b
Merge branch 'jg/mergetool'

* jg/mergetool:
  mergetool: Don't repeat merge tool candidates