diff -r effce0a1f5bd -r 04104042c6ad tests/test-evolve-continue.t --- a/tests/test-evolve-continue.t Tue Nov 19 14:24:31 2019 -0800 +++ b/tests/test-evolve-continue.t Tue Nov 19 14:54:13 2019 -0800 @@ -456,9 +456,9 @@ unresolved merge conflicts (see 'hg help evolve.interrupted') [1] -BROKEN: 'd' should be marked as a copy $ hg st -C M a A d + c R c ? a.orig