David Aguilar 99474b6340 difftool: honor --trust-exit-code for builtin tools ...

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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2014-11-14 13:40:38 -08:00

14 KiB

Executable File

Raw Blame History

View Raw