Skip to content

Commit 719518f

Browse files
davvidgitster
authored andcommitted
mergetool--lib: set IFS for difftool and mergetool
git-sh-setup sets IFS but it is not used by git-difftool--helper. Set IFS in git-mergetool--lib so that the mergetool scriptlets, difftool, and mergetool do not need to do so. Signed-off-by: David Aguilar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3d4a3ff commit 719518f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

git-mergetool--lib.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
: ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}
44

5+
IFS='
6+
'
7+
58
mode_ok () {
69
if diff_mode
710
then

git-mergetool.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,6 @@ fi
451451
printf "Merging:\n"
452452
printf "%s\n" "$files"
453453

454-
IFS='
455-
'
456454
rc=0
457455
for i in $files
458456
do

0 commit comments

Comments
 (0)