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>
Ralf Thielow committed
Aug 5, 2012 at 19:56 UTC
e0453cd8f09aa03f3752d994011963ced7dea3ee
1 file changed
+4
-1
merge-recursive.c
+4
-1
@@ -1915,7 +1915,10 @@ int merge_recursive(struct merge_options *o,
1915
}
1916
1917
if (show(o, 5)) {
1918
- output(o, 5, _("found %u common ancestor(s):"), commit_list_count(ca));
1918
+ unsigned cnt = commit_list_count(ca);
1919
+
1920
+ output(o, 5, Q_("found %u common ancestor:",
1921
+ "found %u common ancestors:", cnt), cnt);
1922
for (iter = ca; iter; iter = iter->next)
1923
output_commit_title(o, iter->item);
1924
}