--- a/tests/test-histedit-non-commute-abort.t Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-histedit-non-commute-abort.t Fri Oct 09 13:54:52 2015 -0700
@@ -72,8 +72,7 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue