Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update output for new `merge --abort` message
authorBoris Feld <boris.feld@octobus.net>
Fri, 19 Jan 2018 19:18:05 +0100
changeset 3430 14fbb847be5a
parent 3429 6096acdc7d37
child 3431 2e703ed1c713
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
tests/test-topic.t file | annotate | diff | comparison | revisions 
--- 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
evolve