Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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>
  • Loading branch information...
commit e0453cd8f09aa03f3752d994011963ced7dea3ee 1 parent 9a7365c
Ralf Thielow authored gitster committed
Showing with 4 additions and 1 deletion.
  1. +4 −1 merge-recursive.c
5 merge-recursive.c
View
@@ -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);
}
Please sign in to comment.
Something went wrong with that request. Please try again.