diff options
| author | David Aguilar <davvid@gmail.com> | 2014-10-27 04:15:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-28 20:36:57 +0300 |
| commit | 2b52123fcf840686b69e10807fd0f985ec4167f3 (patch) | |
| tree | 34420488a17a99b950f100c1a2ac9e2596599480 /git-mergetool--lib.sh | |
| parent | 25098690a0151ba29ec1c728d783366c1899624d (diff) | |
difftool: add support for --trust-exit-code
Teach difftool to exit when a diff tool returns a non-zero exit
code when either --trust-exit-code is specified or
difftool.trustExitCode is true.
Forward exit codes from invoked diff tools to the caller when
--trust-exit-code is used.
Suggested-by: Adri Farr <14farresa@gmail.com>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions