From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 May 2021 12:05:23 +0000 (+0900)
Subject: Merge branch 'ah/merge-ort-i18n'
X-Git-Tag: v2.32.0-rc0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7c7c460f8197867ba5e0e903df83c5a78d0571e;p=thirdparty%2Fgit.git

Merge branch 'ah/merge-ort-i18n'

An i18n fix.

* ah/merge-ort-i18n:
  merge-ort: split "distinct types" message into two translatable messages
---

c7c7c460f8197867ba5e0e903df83c5a78d0571e