diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:27 -0800 |
| commit | b3dac9c07858e7b8b9c99a371c67129c2e7909e3 (patch) | |
| tree | 8afe6cc33c61bb789a22fa6a3f645feab88f1fda /t/t4057-diff-combined-paths.sh | |
| parent | 430fd1cae522d1eff58478eb606bee996b52208f (diff) | |
| parent | 2967284456e9053ee8dd26148c22432a4776a3dc (diff) | |
| download | git-b3dac9c07858e7b8b9c99a371c67129c2e7909e3.tar.gz git-b3dac9c07858e7b8b9c99a371c67129c2e7909e3.tar.xz | |
Merge branch 'da/mergetool-trust-exit-code' into maint
mergetool.<tool>.trustExitCode configuration variable did not apply
to built-in tools, but now it does.
* da/mergetool-trust-exit-code:
mergetools/vimdiff: trust Vim's exit code
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
Diffstat (limited to 't/t4057-diff-combined-paths.sh')
0 files changed, 0 insertions, 0 deletions