Merge branch 'ah/merge-ort-i18n'

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

Junio C Hamano committed May 16, 2021 at 21:05 UTC c7c7c460f8197867ba5e0e903df83c5a78d0571e

No changes.