changeset 3842 | b293cce4ff55 |
parent 3821 | f67ac33c07d2 |
child 3843 | f0096db2a7b1 |
--- a/tests/test-stabilize-result.t Tue Jun 12 03:29:13 2018 +0530 +++ b/tests/test-stabilize-result.t Tue Jun 12 04:01:19 2018 +0530 @@ -394,7 +394,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort + abort: fix conflicts and see `hg help evolve.interrupted` [255] $ cat > a <<EOF