Mercurial > evolve

diff tests/test-evolve-content-divergent-interrupted.t @ 5964:7204178ac04a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: spell out hg resolve See previous commits for the rationale.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 17 Jun 2021 11:18:30 +0300
parents 4688b7eb7e40
children 29bc269bcc96
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t	Thu Jun 17 11:16:53 2021 +0300
+++ b/tests/test-evolve-content-divergent-interrupted.t	Thu Jun 17 11:18:30 2021 +0300
@@ -376,7 +376,7 @@
 this test case is mainly to test that we hit merge conlict while merging the
 two divergent csets, so resolving this one which happened during relocation
   $ echo a > a
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue