From 0eea345111a9b9fea4dd2841b80bc7d62964e812 Mon Sep 17 00:00:00 2001 From: Charles Bailey Date: Thu, 13 Nov 2008 12:41:13 +0000 Subject: [PATCH] Fix some tab/space inconsistencies in git-mergetool.sh git-mergetool.sh mostly uses 8 space tabs and 4 spaces per indent. This change corrects this in a part of the file affect by a later commit in this patch series. diff -w considers this change is to be a null change. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano --- git-mergetool.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 94187c306..e2da5fc54 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -401,25 +401,25 @@ fi if test $# -eq 0 ; then - files=`git ls-files -u | sed -e 's/^[^ ]* //' | sort -u` - if test -z "$files" ; then - echo "No files need merging" - exit 0 - fi - echo Merging the files: "$files" - git ls-files -u | - sed -e 's/^[^ ]* //' | - sort -u | - while IFS= read i - do - printf "\n" - merge_file "$i" < /dev/tty > /dev/tty - done + files=`git ls-files -u | sed -e 's/^[^ ]* //' | sort -u` + if test -z "$files" ; then + echo "No files need merging" + exit 0 + fi + echo Merging the files: "$files" + git ls-files -u | + sed -e 's/^[^ ]* //' | + sort -u | + while IFS= read i + do + printf "\n" + merge_file "$i" < /dev/tty > /dev/tty + done else - while test $# -gt 0; do - printf "\n" - merge_file "$1" - shift - done + while test $# -gt 0; do + printf "\n" + merge_file "$1" + shift + done fi exit 0 -- 2.30.2