summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-mergetool.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index fa301add3f..600aef0a12 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