diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:49 -0800 |
| commit | c4a44e23e03c4a1558a21c15bb880c9411a37fd5 (patch) | |
| tree | 376dbc00b822f2b74c0c9d7b82639d3637dd926d /git-rebase--merge.sh | |
| parent | Merge branch 'ak/lazy-prereq-mktemp' (diff) | |
| parent | mergetools/vimdiff: trust Vim's exit code (diff) | |
| download | tgif-c4a44e23e03c4a1558a21c15bb880c9411a37fd5.tar.xz | |
Merge branch 'da/mergetool-trust-exit-code'
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 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions