Mercurial > evolve

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-6.1 into mercurial-6.0
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 26 Jun 2024 15:39:36 +0400
parents bd2c42680dff
children
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-user-independent-resolution.t	Wed Jun 26 15:19:21 2024 +0400
+++ b/tests/test-evolve-content-divergent-user-independent-resolution.t	Wed Jun 26 15:39:36 2024 +0400
@@ -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