diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -588,8 +588,8 @@
     return _commentlines(msg)
 
 def _helpmessage(continuecmd, abortcmd):
-    msg = _('To continue:                %s\n'
-            'To abort:                   %s') % (continuecmd, abortcmd)
+    msg = _('To continue:    %s\n'
+            'To abort:       %s') % (continuecmd, abortcmd)
     return _commentlines(msg)
 
 def _rebasemsg():
@@ -603,7 +603,7 @@
 
 def _updatecleanmsg(dest=None):
     warning = _('warning: this will discard uncommitted changes')
-    return 'hg update --clean %s    (%s)' % (dest or '.', warning)
+    return 'hg update --clean %s (%s)' % (dest or '.', warning)
 
 def _graftmsg():
     # tweakdefaults requires `update` to have a rev hence the `.`
diff --git a/tests/test-conflict.t b/tests/test-conflict.t
--- a/tests/test-conflict.t
+++ b/tests/test-conflict.t
@@ -57,8 +57,8 @@
   # 
   # To mark files as resolved:  hg resolve --mark FILE
   
-  # To continue:                hg commit
-  # To abort:                   hg update --clean .    (warning: this will discard uncommitted changes)
+  # To continue:    hg commit
+  # To abort:       hg update --clean . (warning: this will discard uncommitted changes)
   
 
   $ cat a
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -236,8 +236,8 @@
   # 
   # To mark files as resolved:  hg resolve --mark FILE
   
-  # To continue:                hg graft --continue
-  # To abort:                   hg update --clean .    (warning: this will discard uncommitted changes)
+  # To continue:    hg graft --continue
+  # To abort:       hg update --clean . (warning: this will discard uncommitted changes)
   
 
 Commit while interrupted should fail:
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -306,8 +306,8 @@
   # 
   # To mark files as resolved:  hg resolve --mark FILE
   
-  # To continue:                hg histedit --continue
-  # To abort:                   hg histedit --abort
+  # To continue:    hg histedit --continue
+  # To abort:       hg histedit --abort
   
   $ hg resolve -l
   U file
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -80,8 +80,8 @@
   # 
   # To mark files as resolved:  hg resolve --mark FILE
   
-  # To continue:                hg rebase --continue
-  # To abort:                   hg rebase --abort
+  # To continue:    hg rebase --continue
+  # To abort:       hg rebase --abort
   
 
 Try to continue without solving the conflict:
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -354,8 +354,8 @@
   # 
   # To mark files as resolved:  hg resolve --mark FILE
   
-  # To continue:                hg unshelve --continue
-  # To abort:                   hg unshelve --abort
+  # To continue:    hg unshelve --continue
+  # To abort:       hg unshelve --abort
   
 
 ensure that we have a merge with unresolved conflicts