Re: [PATCH] mergetool-lib: fix default tool selection

2015-06-19 Thread Junio C Hamano
Michael J Gruber writes: > 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 name

[PATCH] mergetool-lib: fix default tool selection

2015-06-19 Thread Michael J Gruber
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 IF