Mercurial > hg > mercurial-source

diff tests/test-histedit-fold.t @ 28284:e7ff83b2bcfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: list action when intervention is required
author timeless <timeless@mozdev.org>
date Wed, 23 Dec 2015 08:57:04 +0000
parents dcbba68e076f
children 34165875fa5d
line wrap: on
line diff
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -293,7 +293,8 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging file
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
-  Fix up the change and run hg histedit --continue
+  Fix up the change (fold 251d831eeec5)
+  (hg histedit --continue to resume)
   [1]
 There were conflicts, we keep P1 content. This
 should effectively drop the changes from +6.
@@ -354,7 +355,8 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging file
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
-  Fix up the change and run hg histedit --continue
+  Fix up the change (fold 251d831eeec5)
+  (hg histedit --continue to resume)
   [1]
   $ cat > file << EOF
   > 1