Merge branch 'da/mergetool-winmerge' Hotfix for an earlier change already in 'master' that broke the default tool selection for mergetool. * da/mergetool-winmerge: mergetool-lib: fix default tool selection
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 14b039d..54ac8e4 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh
@@ -305,6 +305,7 @@ 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