##// END OF EJS Templates
hg: avoid combining translated strings...
Martin Geisler -
r9454:dafadd7f default
parent child Browse files
Show More
@@ -327,12 +327,8 b' def clone(ui, source, dest=None, pull=Fa'
327 dir_cleanup.cleanup()
327 dir_cleanup.cleanup()
328
328
329 def _showstats(repo, stats):
329 def _showstats(repo, stats):
330 stats = ((stats[0], _("updated")),
330 repo.ui.status(_("%d files updated, %d files merged, "
331 (stats[1], _("merged")),
331 "%d files removed, %d files unresolved\n") % stats)
332 (stats[2], _("removed")),
333 (stats[3], _("unresolved")))
334 note = ", ".join([_("%d files %s") % s for s in stats])
335 repo.ui.status("%s\n" % note)
336
332
337 def update(repo, node):
333 def update(repo, node):
338 """update the working directory to node, merging linear changes"""
334 """update the working directory to node, merging linear changes"""
General Comments 0
You need to be logged in to leave comments. Login now