mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
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>
This commit is contained in:
parent
a0d3ab9c27
commit
0eea345111
|
@ -401,25 +401,25 @@ fi
|
||||||
|
|
||||||
|
|
||||||
if test $# -eq 0 ; then
|
if test $# -eq 0 ; then
|
||||||
files=`git ls-files -u | sed -e 's/^[^ ]* //' | sort -u`
|
files=`git ls-files -u | sed -e 's/^[^ ]* //' | sort -u`
|
||||||
if test -z "$files" ; then
|
if test -z "$files" ; then
|
||||||
echo "No files need merging"
|
echo "No files need merging"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
echo Merging the files: "$files"
|
echo Merging the files: "$files"
|
||||||
git ls-files -u |
|
git ls-files -u |
|
||||||
sed -e 's/^[^ ]* //' |
|
sed -e 's/^[^ ]* //' |
|
||||||
sort -u |
|
sort -u |
|
||||||
while IFS= read i
|
while IFS= read i
|
||||||
do
|
do
|
||||||
printf "\n"
|
printf "\n"
|
||||||
merge_file "$i" < /dev/tty > /dev/tty
|
merge_file "$i" < /dev/tty > /dev/tty
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
while test $# -gt 0; do
|
while test $# -gt 0; do
|
||||||
printf "\n"
|
printf "\n"
|
||||||
merge_file "$1"
|
merge_file "$1"
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Reference in a new issue