tree 9d8f81d3a69a7b3f7924ff35e91f6af0da7f4b7d
parent 7f978d7d10a87c4a56ea3101b936cddb25bbe2c6
author Denton Liu <liu.denton@gmail.com> 1556518880 -0400
committer Junio C Hamano <gitster@pobox.com> 1557756719 +0900

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>