morestatus: remove some extra spaces

The information about unfinished states in `hg status -v` had a lot of spaces
which are not required and feels weird. Let's limit the spacing to four spaces.

Differential Revision: https://phab.mercurial-scm.org/D3730

mercurial/cmdutil.py

@@ -588,8 +588,8 b' To mark files as resolved: hg resolve -'
     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 b' def _unshelvemsg():'
 
 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 `.`

tests/test-conflict.t

@@ -57,8 +57,8 b''
   # 
   # 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

tests/test-graft.t

@@ -236,8 +236,8 b' Using status to get more context'
   # 
   # 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:

tests/test-histedit-fold.t

@@ -306,8 +306,8 b' should effectively drop the changes from'
   # 
   # 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

tests/test-rebase-conflicts.t

@@ -80,8 +80,8 b' Conflicting rebase:'
   # 
   # 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:

tests/test-shelve.t

@@ -354,8 +354,8 b' force a conflicted merge to occur'
   # 
   # 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