]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb60086 2967284)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.