| commit | 6c22d715e7b4067a6865ff3fbceab991d0042c12 | |
| author | Denton Liu <liu.denton@gmail.com> | |
| Mon, 29 Apr 2019 06:21:20 +0000 (29 02:21 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 May 2019 14:11:59 +0000 (13 23:11 +0900) | ||
| tree | 9d8f81d3a69a7b3f7924ff35e91f6af0da7f4b7d | treesnapshot (tar.gz zip) |
| parent | 7f978d7d10a87c4a56ea3101b936cddb25bbe2c6 | commitdiff |
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>
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>
| Documentation/git-difftool.txt | diffblobblamehistory | |
| builtin/difftool.c | diffblobblamehistory | |
| t/t7800-difftool.sh | diffblobblamehistory |