From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Aug 2023 20:26:40 +0000 (-0700)
Subject: Merge branch 'ob/rebase-conflict-advice-i18n-fix'
X-Git-Tag: v2.42.0-rc2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f12cb5052d83f5477f7311ccf00b4249dc6d500b;p=thirdparty%2Fgit.git

Merge branch 'ob/rebase-conflict-advice-i18n-fix'

i18n coverage improvement and avoidance of sentence lego.

* ob/rebase-conflict-advice-i18n-fix:
  advice: handle "rebase" in error_resolve_conflict()
---

f12cb5052d83f5477f7311ccf00b4249dc6d500b