aboutsummaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorRalf Thielow <ralf.thielow@gmail.com>2012-08-05 19:56:38 +0200
committerJunio C Hamano <gitster@pobox.com>2012-08-05 12:34:57 -0700
commite0453cd8f09aa03f3752d994011963ced7dea3ee (patch)
tree4152af437077e4ee771b41773a7a6890ef081f23 /rerere.h
parent9a7365cfa45637056e764f1f4759fcd34c4c1822 (diff)
downloadgit-e0453cd8f09aa03f3752d994011963ced7dea3ee.tar.gz
git-e0453cd8f09aa03f3752d994011963ced7dea3ee.tar.xz
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>
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions