X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-difftool--helper.sh;h=524f5ea8ab14bb44e5a8e6393e40c0ec5c1ddaa2;hb=d1672d90bae20d33512fbf8f9b8330e5840da0c5;hp=e43b5d64de3d06f96063f61d4907a8a95ed1c23b;hpb=b3ce9a0874cc7ec1d0fd5ead97d78a428d1fdd75;p=git.git

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index e43b5d64d..524f5ea8a 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -11,7 +11,8 @@ TOOL_MODE=diff
 # difftool.prompt controls the default prompt/no-prompt behavior
 # and is overridden with $GIT_DIFFTOOL*_PROMPT.
 should_prompt () {
-	prompt=$(git config --bool difftool.prompt || echo true)
+	prompt_merge=$(git config --bool mergetool.prompt || echo true)
+	prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
 	if test "$prompt" = true; then
 		test -z "$GIT_DIFFTOOL_NO_PROMPT"
 	else