projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f346d1f 2967284)
Merge branch 'da/mergetool-trust-exit-code' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:11 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:11 +0000 (10:57 -0800)
commit28ae20286817b6a7d27aaa87bd4dc1e47588d803
tree4ec1cbbf44976fa9d0f67107a487abff2b31eafatree | snapshot
parentf346d1f053307c7091e9a1e8539af82c4cf54817commit | diff
parent2967284456e9053ee8dd26148c22432a4776a3dccommit | diff
Merge branch 'da/mergetool-trust-exit-code' into next

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.