X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=a79a2ecd49411f30517943108851243afa64de7b;hb=31fd8d72f2eb82c2b6d8d450ee4e13a3925291c3;hp=4db9212331259664732f031438b7b87b7a10244f;hpb=5590fe762ff9d68f6968d80979e446576e61e2e1;p=git.git

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 4db921233..a79a2ecd4 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -38,7 +38,7 @@ check_unchanged () {
 		while true; 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 ;;