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()
Junio C Hamano committed
Aug 14, 2023 at 13:26 UTC
f12cb5052d83f5477f7311ccf00b4249dc6d500b
No changes.