Mercurial > evolve

diff tests/test-evolve-content-divergent-user-independent-resolution.t @ 6174:bd2c42680dff mercurial-6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: back out changeset 5e14782908e4 CORE-TEST-OUTPUT-UPDATE: f8f2ecdde4b5 CORE-TEST-OUTPUT-UPDATE: 053a5bf508da
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 07:03:00 +0300
parents 5e14782908e4
children
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-user-independent-resolution.t	Tue Feb 22 07:01:59 2022 +0300
+++ b/tests/test-evolve-content-divergent-user-independent-resolution.t	Tue Feb 22 07:03:00 2022 +0300
@@ -35,7 +35,7 @@
   $ hg push -q
 
   $ cd ../local
-  $ hg push --force -q
+  $ hg push -q
   2 new content-divergent changesets
   $ hg pull -q
   2 new content-divergent changesets