Merge branch 'ah/merge-usage-i18n-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jun 2021 03:04:23 +0000 (12:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jun 2021 03:04:23 +0000 (12:04 +0900)
commitb03709eae705010e5def0602a86529ce0e545f52
treef5ea8c7ee48eb084f2cff19656b1853aaf00a561
parentd6e35a2644d6c0050989061ec93ed0d9111c5ee4
parenta30e43f61a1e614309875ab7775f2274b4e40742
Merge branch 'ah/merge-usage-i18n-fix'

i18n update.

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