projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63d37c3 759a904)
Merge branch 'jn/ancient-meld-support'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800)
* jn/ancient-meld-support:
  mergetools/meld: Use --help output to detect --output support


Trivial merge
Git—the stupid content tracker