--- a/tests/test-histedit-fold-non-commute.t Sat Apr 04 11:37:08 2015 -0700
+++ b/tests/test-histedit-fold-non-commute.t Sat Apr 04 11:39:08 2015 -0700
@@ -132,6 +132,7 @@
$ hg resolve --mark e
(no more unresolved files)
$ hg histedit --continue 2>&1 | fixbundle
+ 7b4e2f4b7bcd: empty changeset
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -274,6 +275,7 @@
$ hg resolve --mark e
(no more unresolved files)
$ hg histedit --continue 2>&1 | fixbundle
+ 7b4e2f4b7bcd: empty changeset
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved