mergetool-lib: fix default tool selection
authorMichael J Gruber <git@drmicha.warpmail.net>
Fri, 19 Jun 2015 09:30:55 +0000 (11:30 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jun 2015 18:20:52 +0000 (11:20 -0700)
When no diff nor merge tool is specified (config, option), mergetool-lib
is supposed to choose a default tool from a set of tools. That set is
constructed dynamically depending on the environment (graphical, editor
setting) as a space separated string of tool names.

719518f (mergetool--lib: set IFS for difftool and mergetool, 2015-05-20)
introduced a newline as IFS which breaks the parsing of the space
separated list into items, resulting in a failed search for an available
tool.

Set IFS to a space locally for the tool search.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found