From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Dec 2016 23:27:49 +0000 (-0800)
Subject: Merge branch 'da/mergetool-trust-exit-code'
X-Git-Tag: v2.12.0-rc0~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4a44e23e03c4a1558a21c15bb880c9411a37fd5;p=git

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
---

c4a44e23e03c4a1558a21c15bb880c9411a37fd5