From cce076e37107217faa942dddc20e79ae7350bc1f Mon Sep 17 00:00:00 2001
From: Nikola Forró <nforro@redhat.com>
Date: Tue, 12 Apr 2016 16:44:20 +0200
Subject: difftool/mergetool: make the form of yes/no questions consistent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Every yes/no question in difftool/mergetool scripts has slightly
different form, and none of them is consistent with the form git
itself uses.

Make the form of all the questions consistent with the form used
by git.

Reviewed-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Nikola Forró <nforro@redhat.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-mergetool--lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-mergetool--lib.sh')

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 54ac8e4846..92adcc0d07 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -100,7 +100,7 @@ check_unchanged () {
 		while true
 		do
 			echo "$MERGED seems unchanged."
-			printf "Was the merge successful? [y/n] "
+			printf "Was the merge successful [y/n]? "
 			read answer || return 1
 			case "$answer" in
 			y*|Y*) return 0 ;;
-- 
cgit v1.3