Andrew's git / gitweb.git / diff
?
Merge branch 'jg/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:43:28 +0000 (17:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:43:28 +0000 (17:43 -0800)
* jg/mergetool:
mergetool: Don't repeat merge tool candidates

Trivial merge