]> git.99rst.org Git - git.git/commit
Merge branch 'ob/rebase-conflict-advice-i18n-fix'
authorJunio C Hamano <redacted>
Mon, 14 Aug 2023 20:26:40 +0000 (13:26 -0700)
committerJunio C Hamano <redacted>
Mon, 14 Aug 2023 20:26:40 +0000 (13:26 -0700)
commitf12cb5052d83f5477f7311ccf00b4249dc6d500b
tree9eb67f6f590c6e810afa35612d575bda75e469a0
parentfac96dfbb1c24369ba7d37a5affd8adfe6c650fd
parentff29a61cbbc83f0948606df37dbc734436b62c17
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()
git clone https://git.99rst.org/PROJECT