diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-10-01 12:58:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-01 12:58:57 -0700 |
| commit | 5ec11ab39d11aecd731044955a7a4f7e925cdba6 (patch) | |
| tree | 87432ee7fd9345d922f2fa7d182246125cc3b61d /mergetools/ecmerge | |
| parent | Merge branch 'os/commit-submodule-ignore' (diff) | |
| parent | mergetool--lib: Allow custom commands to override built-ins (diff) | |
| download | tgif-5ec11ab39d11aecd731044955a7a4f7e925cdba6.tar.xz | |
Merge branch 'da/mergetool-custom'
The actual external command to run for mergetool backend can be
specified with difftool/mergetool.$name.cmd configuration
variables, but this mechanism was ignored for the backends we
natively support.
* da/mergetool-custom:
mergetool--lib: Allow custom commands to override built-ins
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions