diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-20 03:46:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-20 03:46:48 (GMT) |
| commit | 5ec8217eb6c89974fda94808a310aa651577b25d (patch) | |
| tree | 81431dd1bc9acd3be5692363c225628e0993f659 /git-mergetool--lib.sh | |
| parent | 9b502a371e9bc340a537bb19d9a00750428e1651 (diff) | |
| parent | e622f41dcd97861796c7529712170f9eae07dc56 (diff) | |
| download | git-5ec8217eb6c89974fda94808a310aa651577b25d.zip git-5ec8217eb6c89974fda94808a310aa651577b25d.tar.gz git-5ec8217eb6c89974fda94808a310aa651577b25d.tar.bz2 | |
Merge branch 'maint'
* maint:
git-mergetool: check return value from read
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 8fc65d0..ed630b2 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 ;; |