remote-svn: add marks-file regeneration

diff --git a/merge-recursive.c b/merge-recursive.c
index 8903a731f53811ad4542d6db516e20b8e88c58f3..39b2e165e05472daf38cd6f458541b6db4abc9a8 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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);
        }