From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Mar 2024 17:44:43 +0000 (-0800)
Subject: Merge branch 'pb/ort-make-submodule-conflict-message-an-advice'
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=661f3797916d2bc3bd967a9dc9e6e464d5343758;p=rit

Merge branch 'pb/ort-make-submodule-conflict-message-an-advice'

When a merge conflicted at a submodule, merge-ort backend used to
unconditionally give a lengthy message to suggest how to resolve
it.  Now the message can be squelched as an advice message.

* pb/ort-make-submodule-conflict-message-an-advice:
  merge-ort: turn submodule conflict suggestions into an advice
---

661f3797916d2bc3bd967a9dc9e6e464d5343758