diff options
| author | Charles Bailey <charles@hashpling.org> | 2008-11-13 12:41:13 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-14 21:30:55 -0800 |
| commit | 0eea345111a9b9fea4dd2841b80bc7d62964e812 (patch) | |
| tree | 122d60f06a56c7eb16bc8242773bf61e691c778f /git-mergetool.sh | |
| parent | a0d3ab9c277f1a198ec8e29432c0127d4cf719d2 (diff) | |
| download | git-0eea345111a9b9fea4dd2841b80bc7d62964e812.tar.gz | |
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 <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 94187c306c..e2da5fc546 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 |