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

merge-recursive: separate message for common ancestors

Browse Source 
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>
This commit is contained in:
Ralf Thielow 2012-08-05 19:56:38 +02:00 committed by Junio C Hamano
parent 9a7365cfa4
commit e0453cd8f0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
merge-recursive.c
View File

@ -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);
}