Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-conflicts.t
changeset 38341 50f5fc232c16
parent 37842 326b174c6a47
child 39480 89630d0b3e23 
--- 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:
Mercurial