From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Aug 2022 21:42:29 +0000 (-0700)
Subject: Merge branch 'en/submodule-merge-messages-fixes'
X-Git-Tag: v2.38.0-rc0~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df3c129e246dda2b43adcd7661d5aff42bbcf2e2;p=thirdparty%2Fgit.git

Merge branch 'en/submodule-merge-messages-fixes'

Further update the help messages given while merging submodules.

* en/submodule-merge-messages-fixes:
  merge-ort: provide helpful submodule update message when possible
  merge-ort: avoid surprise with new sub_flag variable
  merge-ort: remove translator lego in new "submodule conflict suggestion"
  submodule merge: update conflict error message
---

df3c129e246dda2b43adcd7661d5aff42bbcf2e2