diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-04-29 09:21:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 17:11:59 +0300 |
| commit | 6c22d715e7b4067a6865ff3fbceab991d0042c12 (patch) | |
| tree | 9d8f81d3a69a7b3f7924ff35e91f6af0da7f4b7d /git-mergetool--lib.sh | |
| parent | 7f978d7d10a87c4a56ea3101b936cddb25bbe2c6 (diff) | |
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 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions