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>
Charles Bailey committed
Nov 13, 2008 at 12:41 UTC
0eea345111a9b9fea4dd2841b80bc7d62964e812
1 file changed
+19
-19
git-mergetool.sh
+19
-19
@@ -401,25 +401,25 @@ fi
401
402
403
if test $# -eq 0 ; then
404
- files=`git ls-files -u | sed -e 's/^[^ ]* //' | sort -u`
405
- if test -z "$files" ; then
406
- echo "No files need merging"
407
- exit 0
408
- fi
409
- echo Merging the files: "$files"
410
- git ls-files -u |
411
- sed -e 's/^[^ ]* //' |
412
- sort -u |
413
- while IFS= read i
414
- do
415
- printf "\n"
416
- merge_file "$i" < /dev/tty > /dev/tty
417
- done
404
+ files=`git ls-files -u | sed -e 's/^[^ ]* //' | sort -u`
405
+ if test -z "$files" ; then
406
+ echo "No files need merging"
407
+ exit 0
408
+ fi
409
+ echo Merging the files: "$files"
410
+ git ls-files -u |
411
+ sed -e 's/^[^ ]* //' |
412
+ sort -u |
413
+ while IFS= read i
414
+ do
415
+ printf "\n"
416
+ merge_file "$i" < /dev/tty > /dev/tty
417
+ done
418
else
419
- while test $# -gt 0; do
420
- printf "\n"
421
- merge_file "$1"
422
- shift
423
- done
419
+ while test $# -gt 0; do
420
+ printf "\n"
421
+ merge_file "$1"
422
+ shift
423
+ done
424
fi
425
exit 0