undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/merge-ort-i18n'

Browse Source 
An i18n fix.

* ah/merge-ort-i18n:
  merge-ort: split "distinct types" message into two translatable messages
This commit is contained in:
Junio C Hamano 2021-05-16 21:05:23 +09:00
commit c7c7c460f8
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
merge-ort.c
View File

@ -3050,12 +3050,21 @@ static void process_entry(struct merge_options *opt,
rename_b = 1; rename_b = 1;
} }
if (rename_a && rename_b) {
path_msg(opt, path, 0, path_msg(opt, path, 0,
_("CONFLICT (distinct types): %s had different " _("CONFLICT (distinct types): %s had "
"types on each side; renamed %s of them so " "different types on each side; "
"each can be recorded somewhere."), "renamed both of them so each can "
path, "be recorded somewhere."),
(rename_a && rename_b) ? _("both") : _("one")); path);
} else {
path_msg(opt, path, 0,
_("CONFLICT (distinct types): %s had "
"different types on each side; "
"renamed one of them so each can be "
"recorded somewhere."),
path);
}
ci->merged.clean = 0; ci->merged.clean = 0;
memcpy(new_ci, ci, sizeof(*new_ci)); memcpy(new_ci, ci, sizeof(*new_ci));