From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 22:49:27 +0000 (-0800)
Subject: Merge branch 'da/mergetool-trust-exit-code' into maint
X-Git-Tag: v2.11.1~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3dac9c07858e7b8b9c99a371c67129c2e7909e3;p=thirdparty%2Fgit.git

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

b3dac9c07858e7b8b9c99a371c67129c2e7909e3