Merge branch 'jn/ancient-meld-support'
* jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support
Junio C Hamano committed
Feb 14, 2012 at 12:57 UTC
746b6fb96852accae8a4163f6edda23a4c6de0c7
No changes.