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>
David Aguilar committed
May 20, 2015 at 02:07 UTC
719518f5cebba0fb4ed6caf6d92d683e858120f0
2 files changed
+3
-2
git-mergetool--lib.sh
+3
@@ -2,6 +2,9 @@
2
3
: ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}
4
5
+IFS='
6
+'
7
+
8
mode_ok () {
9
if diff_mode
10
then
git-mergetool.sh
-2
@@ -451,8 +451,6 @@ fi
451
printf "Merging:\n"
452
printf "%s\n" "$files"
453
454
-IFS='
455
-'
454
rc=0
455
for i in $files
456
do