changeset 2842 | 2b8b960a04ee |
parent 2836 | feaa52680682 |
child 2843 | f588de9dd067 |
--- a/tests/test-stabilize-result.t Fri Aug 11 10:52:44 2017 +0200 +++ b/tests/test-stabilize-result.t Fri Aug 11 11:23:37 2017 +0200 @@ -86,7 +86,7 @@ fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort abort: unresolved merge conflicts (see hg help resolve) [255] - $ hg revert -r 'unstable()' a + $ hg revert -r "orphan()" a $ hg diff diff -r 66719795a494 a --- a/a * (glob)