diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:44 -0700 |
| commit | 1998f4c0966871d49ebf7f720dc58eb9f80771e9 (patch) | |
| tree | 50418170d8834e6e9f3479bc01517c234317050f /git-mergetool--lib.sh | |
| parent | 9502751181df4a1347b3bd0fe2f0f0cde9cfaa91 (diff) | |
| parent | af3147147f39274bd0d47faca196f84c4e9ec68d (diff) | |
| download | git-1998f4c0966871d49ebf7f720dc58eb9f80771e9.tar.xz | |
Merge branch 'cb/maint-mergetool-no-tty'
* cb/maint-mergetool-no-tty:
mergetool: Remove explicit references to /dev/tty
Conflicts:
git-mergetool.sh
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 51dd0d67ba..b5e1943b1d 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -35,7 +35,7 @@ check_unchanged () { while true; do echo "$MERGED seems unchanged." printf "Was the merge successful? [y/n] " - read answer < /dev/tty + read answer case "$answer" in y*|Y*) status=0; break ;; n*|N*) status=1; break ;; |