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

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

Junio C Hamano committed Nov 15, 2017 at 12:14 UTC a6ee796aa85ef96cab1ba866e193eedfda2fb5b6

No changes.