Merge branch 'da/mergetool-meld' into maint
* da/mergetool-meld: mergetools/meld: make usage of `--output` configurable and more robust
Junio C Hamano committed
Oct 29, 2014 at 10:35 UTC
9db18387056c713eca8f53bff3bb409d23117f1d
No changes.