diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:30 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:30 +0900 |
| commit | 85ac27e04fd0cf1d086028e87f69ffb498c1451b (patch) | |
| tree | e4486ede9a0d92509bb49a6435e7cb126be6bf99 /builtin/diff-tree.c | |
| parent | Merge branch 'mh/http-fread-api-fix' (diff) | |
| parent | difftool: fallback on merge.guitool (diff) | |
| download | tgif-85ac27e04fd0cf1d086028e87f69ffb498c1451b.tar.xz | |
Merge branch 'dl/difftool-mergetool'
Update "git difftool" and "git mergetool" so that the combinations
of {diff,merge}.{tool,guitool} configuration variables serve as
fallback settings of each other in a sensible order.
* dl/difftool-mergetool:
difftool: fallback on merge.guitool
difftool: make --gui, --tool and --extcmd mutually exclusive
mergetool: fallback to tool when guitool unavailable
mergetool--lib: create gui_mode function
mergetool: use get_merge_tool function
t7610: add mergetool --gui tests
t7610: unsuppress output
Diffstat (limited to 'builtin/diff-tree.c')
0 files changed, 0 insertions, 0 deletions