diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-01-26 16:40:06 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-01-27 18:33:16 -0800 |
| commit | 62957bea0c7637ae1db4452fc165c59d9408585b (patch) | |
| tree | 223b59e3ba2339401b62cbb079be6a6eeba2a6ee /t/t3309-notes-merge-auto-resolve.sh | |
| parent | mergetool--lib: improve show_tool_help() output (diff) | |
| download | tgif-62957bea0c7637ae1db4452fc165c59d9408585b.tar.xz | |
mergetool--lib: don't call "exit" in setup_tool
This will make it easier to use setup_tool in places where we expect
that the selected tool will not support the current mode.
We need to introduce a new return code for setup_tool to differentiate
between the case of "the selected tool is invalid" and "the selected
tool is not a built-in" since we must call setup_tool when a custom
'merge.<tool>.path' is configured for a built-in tool but avoid failing
when the configured tool is not a built-in.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions