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)
commitbdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea
tree9074c7aa81b7dbd3908132246d6392ef569933d8
parent4eed30a7cb56dfd21917a3685eccb1d8321d852f
parent759a904e090b56a3941c1133a0f3302b7fec5054
Merge branch 'jn/ancient-meld-support' into maint

* jn/ancient-meld-support:
  mergetools/meld: Use --help output to detect --output support