Merge branch 'jn/ancient-meld-support' into maint

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

Junio C Hamano committed Feb 27, 2012 at 15:33 UTC bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea

No changes.