]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
An i18n fix.

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

1  2 
merge-ort.c

diff --cc merge-ort.c
Simple merge