diff -r f4147ca63d39 -r 15d2afa31e57 tests/test-histedit-fold-non-commute.t --- a/tests/test-histedit-fold-non-commute.t Fri Mar 29 21:53:15 2019 -0400 +++ b/tests/test-histedit-fold-non-commute.t Mon Apr 01 19:02:24 2019 -0700 @@ -94,7 +94,6 @@ edit the history $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change (fold 42abbb61bede) @@ -249,7 +248,6 @@ edit the history $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change (roll 42abbb61bede)