• Michael J Gruber's avatar
    mergetool-lib: fix default tool selection · f67986b9
    Michael J Gruber authored
    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.
    
    719518f5 (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: default avatarMichael J Gruber <[email protected]>
    Signed-off-by: default avatarJunio C Hamano <[email protected]>
    f67986b9
git-mergetool--lib.sh 7.26 KB