On 3/1/2022 11:19 PM, Elijah Newren via GitGitGadget wrote:

From: Elijah Newren <redacted>

merge-recursive would only report messages from inner merges when the
GIT_MERGE_VERBOSITY was set to 5.  Do the same for merge-ort.

Note that somewhat reverts 0d83d8240d ("merge-ort: mark conflict/warning
messages from inner merges as omittable", 2022-02-02) based on two
facts:

Makes sense.

-	if (opt->record_conflict_msgs_as_headers && opt->priv->call_depth)
-		return; /* Do not record inner merge issues in headers */
+	if (opt->priv->call_depth && opt->verbosity < 5)
+		return; /* Ignore messages from inner merges */
+

Exactly matches your intentions. Excellent.

It might be nice to have a test that demonstrates this
verbosity, but I'm not going to block this patch on that.

Thanks,
-Stolee