From d1dc6959bbff89496e3ae5d845d73e98ae213e09 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Mar 2007 06:46:59 -0400 Subject: [PATCH] mergetool: portability fix: don't assume true is in /bin Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index fa301add3..600aef0a1 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -61,7 +61,7 @@ function describe_file () { resolve_symlink_merge () { - while /bin/true; do + while true; do printf "Use (r)emote or (l)ocal, or (a)bort? " read ans case "$ans" in @@ -85,7 +85,7 @@ resolve_symlink_merge () { } resolve_deleted_merge () { - while /bin/true; do + while true; do printf "Use (m)odified or (d)eleted file, or (a)bort? " read ans case "$ans" in -- 2.11.0