diff mercurial/hg.py @ 20870:6500a2eebee8

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Apr 2014 15:11:19 -0500
parents 81d6dc8c3c63 5db105f216c3
children f117a0ba5289
line wrap: on
line diff
--- a/mercurial/hg.py	Wed Mar 19 23:04:03 2014 -0700
+++ b/mercurial/hg.py	Tue Apr 01 15:11:19 2014 -0500
@@ -451,7 +451,7 @@
                         if bn == 'default':
                             status = _("updating to bookmark @\n")
                         else:
-                            status = _("updating to bookmark @ on branch %s\n"
+                            status = (_("updating to bookmark @ on branch %s\n")
                                        % bn)
                     except KeyError:
                         try: