mergetool: portability fix: don't assume true is in /bin
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o committed
Mar 29, 2007 at 06:46 UTC
d1dc6959bbff89496e3ae5d845d73e98ae213e09
1 file changed
+2
-2
git-mergetool.sh
+2
-2
@@ -61,7 +61,7 @@ function describe_file () {
61
62
63
resolve_symlink_merge () {
64
- while /bin/true; do
64
+ while true; do
65
printf "Use (r)emote or (l)ocal, or (a)bort? "
66
read ans
67
case "$ans" in
@@ -85,7 +85,7 @@ resolve_symlink_merge () {
85
}
86
87
resolve_deleted_merge () {
88
- while /bin/true; do
88
+ while true; do
89
printf "Use (m)odified or (d)eleted file, or (a)bort? "
90
read ans
91
case "$ans" in