diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 10:35:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 10:35:16 -0700 |
| commit | 9db18387056c713eca8f53bff3bb409d23117f1d (patch) | |
| tree | cc2563f48b170c298e5a79e84b8809d02f4db639 /unix-socket.c | |
| parent | af1b4e350f5f24e4fbc6f870c9e1552175b86b76 (diff) | |
| parent | b12d04503b0aba1f2d68b164b348cbf94bbe570b (diff) | |
| download | git-9db18387056c713eca8f53bff3bb409d23117f1d.tar.gz git-9db18387056c713eca8f53bff3bb409d23117f1d.tar.xz | |
Merge branch 'da/mergetool-meld' into maint
* da/mergetool-meld:
mergetools/meld: make usage of `--output` configurable and more robust
Diffstat (limited to 'unix-socket.c')
0 files changed, 0 insertions, 0 deletions