diff mercurial/discovery.py @ 15513:646759147717

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 17 Nov 2011 16:53:17 -0600
parents fa47291b3f1f 9bea3aed6ee1
children cff25e4b37d2
line wrap: on
line diff
--- a/mercurial/discovery.py	Mon Nov 14 18:16:01 2011 +0100
+++ b/mercurial/discovery.py	Thu Nov 17 16:53:17 2011 -0600
@@ -178,9 +178,9 @@
                         hint = _("did you forget to merge? "
                                  "use push -f to force")
                 if branch is not None:
-                    repo.ui.note("new remote heads on branch '%s'\n" % branch)
+                    repo.ui.note(_("new remote heads on branch '%s'\n") % branch)
                 for h in dhs:
-                    repo.ui.note("new remote head %s\n" % short(h))
+                    repo.ui.note(_("new remote head %s\n") % short(h))
         if error:
             raise util.Abort(error, hint=hint)