From: Junio C Hamano Date: Wed, 29 Oct 2014 17:35:16 +0000 (-0700) Subject: Merge branch 'da/mergetool-meld' into maint X-Git-Tag: v2.1.3~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9db18387056c713eca8f53bff3bb409d23117f1d Merge branch 'da/mergetool-meld' into maint * da/mergetool-meld: mergetools/meld: make usage of `--output` configurable and more robust --- 9db18387056c713eca8f53bff3bb409d23117f1d