Skip to content

Commit

Permalink
mergetool: portability fix: don't assume true is in /bin
Browse files Browse the repository at this point in the history
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  • Loading branch information
Theodore Ts'o committed Mar 29, 2007
1 parent ce5b6d7 commit d1dc695
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-mergetool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit d1dc695

Please sign in to comment.