lf_to_crlf_filter(): tell the caller we added "\n" when draining

[git.git] / git-mergetool.sh

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 3c157bcd26232c758572bf908add44216cb8e2e7..b6d463f0d057361ab5909209d24fc8fd383a3dbb 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -72,7 +72,7 @@ describe_file () {
 resolve_symlink_merge () {
     while true; do
        printf "Use (l)ocal or (r)emote, or (a)bort? "
-       read ans
+       read ans || return 1
        case "$ans" in
            [lL]*)
                git checkout-index -f --stage=2 -- "$MERGED"