From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:14:28 +0000 (+0900)
Subject: Merge branch 'ao/merge-verbosity-getenv-just-once'
X-Git-Tag: v2.16.0-rc0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6ee796aa85ef96cab1ba866e193eedfda2fb5b6;p=thirdparty%2Fgit.git

Merge branch 'ao/merge-verbosity-getenv-just-once'

Code cleanup.

* ao/merge-verbosity-getenv-just-once:
  merge-recursive: check GIT_MERGE_VERBOSITY only once
---

a6ee796aa85ef96cab1ba866e193eedfda2fb5b6