tests/test-conflict.t

--- a/tests/test-conflict.t	Fri Jun 15 16:32:31 2018 -0700
+++ b/tests/test-conflict.t	Wed Jun 13 22:50:32 2018 +0530
@@ -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