From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Mar 2007 10:46:59 +0000 (-0400)
Subject: mergetool: portability fix: don't assume true is in /bin
X-Git-Tag: v1.5.1~19^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1dc6959bbff89496e3ae5d845d73e98ae213e09;p=git.git

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 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