Merge branch 'ah/merge-ort-i18n'
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 May 2021 12:05:23 +0000 (21:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 May 2021 12:05:23 +0000 (21:05 +0900)
commitc7c7c460f8197867ba5e0e903df83c5a78d0571e
treedf01ed677aa4a06eed66047317e1df8c8be647a4
parent483932a3d8dae23207de8ec8683a5236ef3098d9
parent0e59f7ad67d9bf9153d405577a07b5c360c55f41
Merge branch 'ah/merge-ort-i18n'

An i18n fix.

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