From: David Aguilar <davvid@gmail.com>
Date: Wed, 20 May 2015 09:07:22 +0000 (-0700)
Subject: mergetool--lib: set IFS for difftool and mergetool
X-Git-Tag: v2.5.0-rc0~65^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=719518f5cebba0fb4ed6caf6d92d683e858120f0;p=thirdparty%2Fgit.git

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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index fe61e89f31..14b039de65 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -2,6 +2,9 @@
 
 : ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}
 
+IFS='
+'
+
 mode_ok () {
 	if diff_mode
 	then
diff --git a/git-mergetool.sh b/git-mergetool.sh
index d20581c15c..9f77e3a8bb 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -451,8 +451,6 @@ fi
 printf "Merging:\n"
 printf "%s\n" "$files"
 
-IFS='
-'
 rc=0
 for i in $files
 do