From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Jun 2021 03:04:23 +0000 (+0900)
Subject: Merge branch 'ah/merge-usage-i18n-fix'
X-Git-Tag: v2.33.0-rc0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b03709eae705010e5def0602a86529ce0e545f52;p=thirdparty%2Fgit.git

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

i18n update.

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

b03709eae705010e5def0602a86529ce0e545f52