diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 06:46:59 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 12:22:50 -0400 |
| commit | d1dc6959bbff89496e3ae5d845d73e98ae213e09 (patch) | |
| tree | 91475fc8201ddaa1d41037605c7dc6466d11b338 /git-mergetool.sh | |
| parent | ce5b6d752bf4fdc72697ef85b3589983f52d7007 (diff) | |
| download | git-d1dc6959bbff89496e3ae5d845d73e98ae213e09.tar.gz git-d1dc6959bbff89496e3ae5d845d73e98ae213e09.tar.xz | |
mergetool: portability fix: don't assume true is in /bin
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 4 |
1 files 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 |