commit | 9db18387056c713eca8f53bff3bb409d23117f1d | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Oct 29 10:35:16 2014 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Oct 29 10:35:16 2014 -0700 |
tree | cc2563f48b170c298e5a79e84b8809d02f4db639 | |
parent | af1b4e350f5f24e4fbc6f870c9e1552175b86b76 [diff] | |
parent | b12d04503b0aba1f2d68b164b348cbf94bbe570b [diff] |
Merge branch 'da/mergetool-meld' into maint * da/mergetool-meld: mergetools/meld: make usage of `--output` configurable and more robust