diff options
| author | Ralf Thielow <ralf.thielow@gmail.com> | 2012-08-05 19:56:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-05 12:34:57 -0700 |
| commit | e0453cd8f09aa03f3752d994011963ced7dea3ee (patch) | |
| tree | 4152af437077e4ee771b41773a7a6890ef081f23 /merge-recursive.c | |
| parent | 9a7365cfa45637056e764f1f4759fcd34c4c1822 (diff) | |
| download | git-e0453cd8f09aa03f3752d994011963ced7dea3ee.tar.gz | |
merge-recursive: separate message for common ancestors
The function "merge_recursive" prints the count of common ancestors
as "found %u common ancestor(s):". We should use a singular and a
plural form of this message to help translators.
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8903a731f5..39b2e165e0 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1915,7 +1915,10 @@ int merge_recursive(struct merge_options *o, } if (show(o, 5)) { - output(o, 5, _("found %u common ancestor(s):"), commit_list_count(ca)); + unsigned cnt = commit_list_count(ca); + + output(o, 5, Q_("found %u common ancestor:", + "found %u common ancestors:", cnt), cnt); for (iter = ca; iter; iter = iter->next) output_commit_title(o, iter->item); } |