Merge branch 'ee/clean-remove-dirs'

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 14b039de6513459a7f39ec434638ed15eaf1d9b2..54ac8e484674710ca21ea0038d07dcbefbe2fb1e 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -305,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