X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-difftool--helper.sh;h=524f5ea8ab14bb44e5a8e6393e40c0ec5c1ddaa2;hb=0ec9ee3bcf5c926df9d54f63ff3ed8b97e19bb0d;hp=e43b5d64de3d06f96063f61d4907a8a95ed1c23b;hpb=5fc9df08b564aa9d11265ad591f9ef104695ce2b;p=git.git

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index e43b5d64d..0594bf7ca 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
@@ -48,6 +49,7 @@ launch_merge_tool () {
 	fi
 
 	if use_ext_cmd; then
+		export BASE
 		eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
 	else
 		run_merge_tool "$merge_tool"