X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=ed630b208a80a36d729b5074a39bc53df0cabd59;hb=ffa4c364f4ec090438de48a986f02cdeb302b46c;hp=8fc65d0400545e30fd56f890e6b17052f54f857c;hpb=78c5be231bbd58f4deb6ecfabfaff1b2279a4c25;p=git.git

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 8fc65d040..ed630b208 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -21,7 +21,7 @@ check_unchanged () {
 		do
 			echo "$MERGED seems unchanged."
 			printf "Was the merge successful? [y/n] "
-			read answer
+			read answer || return 1
 			case "$answer" in
 			y*|Y*) status=0; break ;;
 			n*|N*) status=1; break ;;