diff -r 8bd60e09dfb4 -r a2fdbece7ce1 tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Tue Jan 22 12:55:09 2019 -0500 +++ b/tests/test-stabilize-conflict.t Tue Jan 22 12:57:25 2019 -0500 @@ -76,7 +76,6 @@ neuf dix $ hg amend - 1 new orphan changesets $ hg evolve move:[2] babar count up to fifteen atop:[3] babar count up to ten @@ -122,7 +121,6 @@ -dix +ten $ hg amend - 1 new orphan changesets $ hg evolve move:[4] babar count up to fifteen atop:[5] babar count up to ten @@ -209,7 +207,6 @@ -ten +zehn $ hg amend - 1 new orphan changesets $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH $ hg evolve --tool touch < n