Andrew's git / gitweb.git / diff
?
Merge branch 'jn/ancient-meld-support' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:33:07 +0000 (15:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:33:07 +0000 (15:33 -0800)
* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support

Trivial merge