From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Feb 2022 23:47:38 +0000 (-0800)
Subject: Merge branch 'en/ort-inner-merge-conflict-report'
X-Git-Tag: v2.36.0-rc0~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3db182886fccb2220b8aa0a2389cf1c2e12aadb;p=thirdparty%2Fgit.git

Merge branch 'en/ort-inner-merge-conflict-report'

Messages "ort" merge backend prepares while dealing with conflicted
paths were unnecessarily confusing since it did not differentiate
inner merges and outer merges.

* en/ort-inner-merge-conflict-report:
  merge-ort: make informational messages from recursive merges clearer
---

b3db182886fccb2220b8aa0a2389cf1c2e12aadb