Documentation/git-commit: clarify that --only/--include records the working tree contents

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 4db9212331259664732f031438b7b87b7a10244f..a79a2ecd49411f30517943108851243afa64de7b 100644 (file)
--- 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 ;;