X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-difftool--helper.sh;h=e6558d101062929241cc30cd0272556c3164310b;hb=dbdc07fcbe3a951df8a3869b42edb6fffd466486;hp=8452890be974d30942f0acaa3f19282c1b8b25b2;hpb=901c907d83f523a5df0b10c0aafb19c512836624;p=git.git

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 8452890be..e6558d101 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -43,12 +43,15 @@ launch_merge_tool () {
 		printf "\nViewing: '$MERGED'\n"
 		if use_ext_cmd
 		then
-			printf "Hit return to launch '%s': " \
+			printf "Launch '%s' [Y/n]: " \
 				"$GIT_DIFFTOOL_EXTCMD"
 		else
-			printf "Hit return to launch '%s': " "$merge_tool"
+			printf "Launch '%s' [Y/n]: " "$merge_tool"
+		fi
+		if read ans && test "$ans" = n
+		then
+			return
 		fi
-		read ans
 	fi
 
 	if use_ext_cmd