summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-03-29 10:46:59 (GMT)
committerTheodore Ts'o <tytso@mit.edu>2007-03-29 16:22:50 (GMT)
commitd1dc6959bbff89496e3ae5d845d73e98ae213e09 (patch)
tree91475fc8201ddaa1d41037605c7dc6466d11b338 /git-mergetool.sh
parentce5b6d752bf4fdc72697ef85b3589983f52d7007 (diff)
downloadgit-d1dc6959bbff89496e3ae5d845d73e98ae213e09.zip
git-d1dc6959bbff89496e3ae5d845d73e98ae213e09.tar.gz
git-d1dc6959bbff89496e3ae5d845d73e98ae213e09.tar.bz2
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-xgit-mergetool.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index fa301ad..600aef0 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