| commit | 62957bea0c7637ae1db4452fc165c59d9408585b | |
| author | John Keeping <john@keeping.me.uk> | |
| Sun, 27 Jan 2013 00:40:06 +0000 (26 16:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Jan 2013 02:33:16 +0000 (27 18:33 -0800) | ||
| tree | 223b59e3ba2339401b62cbb079be6a6eeba2a6ee | treesnapshot (tar.gz zip) |
| parent | 88d3406ad77dbab4d8ea76756822531228332b1b | commitdiff |
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>
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>
| git-mergetool--lib.sh | diffblobblamehistory |