Browse Source

Allow git-mergetool to handle paths with a leading space

Signed-off-by: Rogan Dawes <rogan@dawes.za.net>
maint
Rogan Dawes 17 years ago committed by Junio C Hamano
parent
commit
2e8fd78195
  1. 7
      git-mergetool.sh

7
git-mergetool.sh

@ -393,8 +393,11 @@ if test $# -eq 0 ; then @@ -393,8 +393,11 @@ if test $# -eq 0 ; then
echo "No files need merging"
exit 0
fi
echo Merging the files: $files
git ls-files -u | sed -e 's/^[^ ]* //' | sort -u | while read i
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

Loading…
Cancel
Save