зеркало из https://github.com/microsoft/git.git
Allow git-mergetool to handle paths with a leading space
Signed-off-by: Rogan Dawes <rogan@dawes.za.net>
This commit is contained in:
Родитель
7ec43959f7
Коммит
2e8fd78195
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче