Mercurial > evolve

diff tests/test-evolve-obshistory-content-divergent.t @ 6065:c0921b5277a0 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:32:36 +0300
parents 08c30eef85d3 1ac08311ae15
children 171d13d8f0ce
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-content-divergent.t	Tue Oct 12 11:15:44 2021 +0300
+++ b/tests/test-evolve-obshistory-content-divergent.t	Tue Oct 12 11:32:36 2021 +0300
@@ -439,7 +439,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' has diverged
+  abort: hidden revision '471f378eab4c' has diverged!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'