| commit | 9db18387056c713eca8f53bff3bb409d23117f1d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Oct 2014 17:35:16 +0000 (29 10:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Oct 2014 17:35:16 +0000 (29 10:35 -0700) | ||
| tree | cc2563f48b170c298e5a79e84b8809d02f4db639 | treesnapshot (tar.gz zip) |
| parent | af1b4e350f5f24e4fbc6f870c9e1552175b86b76 | commitdiff |
| parent | b12d04503b0aba1f2d68b164b348cbf94bbe570b | commitdiff |
Merge branch 'da/mergetool-meld' into maint
* da/mergetool-meld:
mergetools/meld: make usage of `--output` configurable and more robust
* da/mergetool-meld:
mergetools/meld: make usage of `--output` configurable and more robust