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/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master | |
| parent | Merge branch 'nd/worktree-list-fixup' into maint (diff) | |
| parent | mergetools/vimdiff: trust Vim's exit code (diff) | |
| download | tgif-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/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master')
0 files changed, 0 insertions, 0 deletions