diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-04-29 02:21:20 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:11:59 +0900 |
| commit | 6c22d715e7b4067a6865ff3fbceab991d0042c12 (patch) | |
| tree | 9d8f81d3a69a7b3f7924ff35e91f6af0da7f4b7d /builtin/rm.c | |
| parent | difftool: make --gui, --tool and --extcmd mutually exclusive (diff) | |
| download | tgif-6c22d715e7b4067a6865ff3fbceab991d0042c12.tar.xz | |
difftool: fallback on merge.guitool
In git-difftool.txt, it says
'git difftool' falls back to 'git mergetool' config variables when the
difftool equivalents have not been defined.
However, when `diff.guitool` is missing, it doesn't fallback to
anything. Make git-difftool fallback to `merge.guitool` when `diff.guitool` is
missing.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rm.c')
0 files changed, 0 insertions, 0 deletions