Merge branch 'ah/merge-usage-i18n-fix'

i18n update. * ah/merge-usage-i18n-fix: merge: don't translate literal commands

Junio C Hamano committed Jun 10, 2021 at 12:04 UTC b03709eae705010e5def0602a86529ce0e545f52

No changes.