mergetool: portability fix: don't assume true is in /bin

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/git-mergetool.sh b/git-mergetool.sh
index fa301add3f2705ed02752c935c78afbfa2f48da2..600aef0a124bab59ef42c426c44f5690f9131cf7 100755 (executable)
--- 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