Mercurial Mercurial > hg-stable / 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-histedit-base.t
changeset 27629 e7ff83b2bcfe
parent 27627 dcbba68e076f
child 27712 bb810c8b3eca 
--- a/tests/test-histedit-base.t	Wed Dec 23 08:52:52 2015 +0000
+++ b/tests/test-histedit-base.t	Wed Dec 23 08:57:04 2015 +0000
@@ -146,7 +146,8 @@
   > EOF
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
-  Fix up the change and run hg histedit --continue
+  Fix up the change (pick 591369deedfd)
+  (hg histedit --continue to resume)
   $ hg histedit --abort | fixbundle
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tglog
@@ -174,7 +175,8 @@
   > EOF
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
-  Fix up the change and run hg histedit --continue
+  Fix up the change (pick 591369deedfd)
+  (hg histedit --continue to resume)
   $ echo b2 > B
   $ hg resolve --mark B
   (no more unresolved files)
hg-stable