diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-16 12:05:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-16 12:05:23 (GMT) |
| commit | c7c7c460f8197867ba5e0e903df83c5a78d0571e (patch) | |
| tree | df01ed677aa4a06eed66047317e1df8c8be647a4 /merge-ort.c | |
| parent | 483932a3d8dae23207de8ec8683a5236ef3098d9 (diff) | |
| parent | 0e59f7ad67d9bf9153d405577a07b5c360c55f41 (diff) | |
| download | git-c7c7c460f8197867ba5e0e903df83c5a78d0571e.zip git-c7c7c460f8197867ba5e0e903df83c5a78d0571e.tar.gz git-c7c7c460f8197867ba5e0e903df83c5a78d0571e.tar.bz2 | |
Merge branch 'ah/merge-ort-i18n'
An i18n fix.
* ah/merge-ort-i18n:
merge-ort: split "distinct types" message into two translatable messages
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/merge-ort.c b/merge-ort.c index dee70d6..4a9ce2a 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3050,12 +3050,21 @@ static void process_entry(struct merge_options *opt, rename_b = 1; } - path_msg(opt, path, 0, - _("CONFLICT (distinct types): %s had different " - "types on each side; renamed %s of them so " - "each can be recorded somewhere."), - path, - (rename_a && rename_b) ? _("both") : _("one")); + if (rename_a && rename_b) { + path_msg(opt, path, 0, + _("CONFLICT (distinct types): %s had " + "different types on each side; " + "renamed both of them so each can " + "be recorded somewhere."), + 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; memcpy(new_ci, ci, sizeof(*new_ci)); |