Re: [PATCH v2] difftool: add support for --trust-exit-code

2014-10-26 Thread Johannes Sixt
Am 26.10.2014 um 02:38 schrieb David Aguilar: > diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh > index 7ef36b9..fdbd768 100755 > --- a/git-difftool--helper.sh > +++ b/git-difftool--helper.sh > @@ -62,6 +62,8 @@ launch_merge_tool () { > else > run_merge_tool "$mer

[PATCH v2] difftool: add support for --trust-exit-code

2014-10-25 Thread David Aguilar
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 <14farr...@gmail.com> Signed-off-by: