]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 430fd1c 2967284)
Merge branch 'da/mergetool-trust-exit-code' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:27 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:27 +0000 (14:49 -0800)
commitb3dac9c07858e7b8b9c99a371c67129c2e7909e3
tree8afe6cc33c61bb789a22fa6a3f645feab88f1fdatree | snapshot
parent430fd1cae522d1eff58478eb606bee996b52208fcommit | diff
parent2967284456e9053ee8dd26148c22432a4776a3dccommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.