From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Mar 2022 22:56:17 +0000 (+0000)
Subject: Merge branch 'en/merge-ort-align-verbosity-with-recursive'
X-Git-Tag: v2.36.0-rc0~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b44e05abf256c5c43116b983719cafca2934952;p=thirdparty%2Fgit.git

Merge branch 'en/merge-ort-align-verbosity-with-recursive'

Align the level of verbose output from the ort backend during inner
merge to that of the recursive backend.

* en/merge-ort-align-verbosity-with-recursive:
  merge-ort: exclude messages from inner merges by default
---

8b44e05abf256c5c43116b983719cafca2934952