Imported Upstream version 2.10.4

[platform/upstream/git.git] / git-mergetool.sh

diff --git a/git-mergetool.sh b/git-mergetool.sh
index f67bab5..bf86270 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -413,7 +413,7 @@ done
 prompt_after_failed_merge () {
        while true
        do
-               printf "Continue merging other unresolved paths (y/n) ? "
+               printf "Continue merging other unresolved paths [y/n]? "
                read ans || return 1
                case "$ans" in
                [yY]*)