git/git-mergetool--lib.sh, branch v2.9.2

Merge branch 'nf/mergetool-prompt'

2016-05-03T21:08:17Z

UI consistency improvements. * nf/mergetool-prompt: difftool/mergetool: make the form of yes/no questions consistent

difftool/mergetool: make the form of yes/no questions consistent

2016-04-25T22:15:17Z

Every yes/no question in difftool/mergetool scripts has slightly different form, and none of them is consistent with the form git itself uses. Make the form of all the questions consistent with the form used by git. Reviewed-by: John Keeping Signed-off-by: Nikola Forró Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: create mergetool_find_win32_cmd() helper function for winmerge

2016-04-04T16:15:00Z

Signed-off-by: Jacob Nisnevich Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool-lib: fix default tool selection

2015-06-19T18:20:52Z

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 Signed-off-by: Junio C Hamano

mergetool--lib: set IFS for difftool and mergetool

2015-05-20T20:13:42Z

git-sh-setup sets IFS but it is not used by git-difftool--helper. Set IFS in git-mergetool--lib so that the mergetool scriptlets, difftool, and mergetool do not need to do so. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool--lib: remove use of $status global

2014-11-21T19:27:53Z

Remove return statements and rework check_unchanged() so that the exit status from the last evaluated expression bubbles up to the callers. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool--lib: remove no-op assignment to $status from setup_user_tool

2014-11-21T19:27:37Z

Even though setup_user_tool assigns the exit status from "eval $merge_tool_cmd" to $status, the variable is overwritten by the function it calls next, check_unchanged, without ever getting looked at by anybody. And "return $status" at the end of this function returns the value check_unchanged assigned to it (which is the same as the value the function returns). Which makes the assignment a no-op. Remove it. Signed-off-by: Junio C Hamano

Merge branch 'da/difftool'

2014-11-18T18:16:55Z

Fix-up to a new feature in 'master'. * da/difftool: difftool: honor --trust-exit-code for builtin tools

difftool: honor --trust-exit-code for builtin tools

2014-11-14T21:40:38Z

run_merge_tool() was not setting $status, which prevented the exit code for builtin tools from being forwarded to the caller. Capture the exit status and add a test to guarantee the behavior. Reported-by: Adria Farres <14farresa@gmail.com> Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: rename bc3 to bc

2014-10-21T18:25:30Z

Beyond Compare version 4 works the same way as version 3, so rename the existing "bc3" adaptor to just "bc", while keeping "bc3" as a backward compatible wrapper. Noticed-by: Olivier Croquette Helped-by: David Aguilar Signed-off-by: Junio C Hamano