Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
---
git-mergetool.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 9d959a9..7d2dadd 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -63,7 +63,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
@@ -87,7 +87,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
--
1.5.1.rc2.1.g8afe-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html