Seventh batch for 2.6

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index fe61e89f31c44ca90dbfba468cf8b23d3993ba9f..54ac8e484674710ca21ea0038d07dcbefbe2fb1e 100644 (file)
--- 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
@@ -302,6 +305,7 @@ guess_merge_tool () {
        EOF
 
        # Loop over each candidate and stop when a valid merge tool is found.
+       IFS=' '
        for tool in $tools
        do
                is_available "$tool" && echo "$tool" && return 0