| commit | e0453cd8f09aa03f3752d994011963ced7dea3ee | |
| author | Ralf Thielow <ralf.thielow@gmail.com> | |
| Sun, 5 Aug 2012 17:56:38 +0000 (5 19:56 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 5 Aug 2012 19:34:57 +0000 (5 12:34 -0700) | ||
| tree | 4152af437077e4ee771b41773a7a6890ef081f23 | treesnapshot (tar.gz zip) |
| parent | 9a7365cfa45637056e764f1f4759fcd34c4c1822 | commitdiff |
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>
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 | diffblobblamehistory |