Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-conflicts.t @ 38341:50f5fc232c16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 13 Jun 2018 22:50:32 +0530
parents 326b174c6a47
children 89630d0b3e23
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Fri Jun 15 16:32:31 2018 -0700
+++ b/tests/test-rebase-conflicts.t	Wed Jun 13 22:50:32 2018 +0530
@@ -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: