# HG changeset patch # User Boris Feld # Date 1516385885 -3600 # Node ID 14fbb847be5a31e429d28afced7254e760d89f60 # Parent 6096acdc7d370481621ebb13840694737a04f444 test: update output for new `merge --abort` message Core have updated its command to cancel a failed merge, update the test output to match it. CORE-TEST-OUTPUT-UPDATE: 41ef02ba329b diff -r 6096acdc7d37 -r 14fbb847be5a tests/test-topic.t --- a/tests/test-topic.t Sat Jan 20 11:13:21 2018 +0100 +++ b/tests/test-topic.t Fri Jan 19 19:18:05 2018 +0100 @@ -384,7 +384,7 @@ merging alpha warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] $ hg revert -r narf alpha $ hg resolve -m alpha