--- a/tests/test-histedit-fold.t Wed Dec 23 08:52:52 2015 +0000
+++ b/tests/test-histedit-fold.t Wed Dec 23 08:57:04 2015 +0000
@@ -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