From 2e8fd7819521b43e89f3baa9c6a95042ed7da4b4 Mon Sep 17 00:00:00 2001 From: Rogan Dawes Date: Mon, 7 Jan 2008 09:37:38 +0200 Subject: [PATCH] Allow git-mergetool to handle paths with a leading space Signed-off-by: Rogan Dawes --- git-mergetool.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 2f31fa241..cbbb70795 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -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 -- 2.26.2