]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'da/mergetool-trust-exit-code'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
commitc4a44e23e03c4a1558a21c15bb880c9411a37fd5
tree376dbc00b822f2b74c0c9d7b82639d3637dd926d
parenteb600866c3bb7b9b659d4776c1d3283963e93f1a
parent2967284456e9053ee8dd26148c22432a4776a3dc
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