Merge branch 'da/difftool' into maint

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 2b11b1d6fe33cf3f61dd35b8f48d6953f7a25bff..84d6cc021c51ac53b68a8b9fdbdd3ed0f8d9d30a 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -44,10 +44,10 @@ launch_merge_tool () {
                        "$GIT_DIFF_PATH_TOTAL" "$MERGED"
                if use_ext_cmd
                then
-                       printf "Launch '%s' [Y/n]: " \
+                       printf "Launch '%s' [Y/n]? " \
                                "$GIT_DIFFTOOL_EXTCMD"
                else
-                       printf "Launch '%s' [Y/n]: " "$merge_tool"
+                       printf "Launch '%s' [Y/n]? " "$merge_tool"
                fi
                read ans || return
                if test "$ans" = n