merge-recursive: separate message for common ancestors
authorRalf Thielow <ralf.thielow@gmail.com>
Sun, 5 Aug 2012 17:56:38 +0000 (19:56 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 5 Aug 2012 19:34:57 +0000 (12:34 -0700)
commite0453cd8f09aa03f3752d994011963ced7dea3ee
tree4152af437077e4ee771b41773a7a6890ef081f23
parent9a7365cfa45637056e764f1f4759fcd34c4c1822
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>
merge-recursive.c