Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-obsolete.t
branchmercurial-3.8
changeset 3005 f66227d76402
parent 2802 41c9a4df628e
parent 3004 a456f55b3a6b
child 3113 27305068c5c9 
--- a/tests/test-obsolete.t	Tue Jul 25 15:18:24 2017 +0200
+++ b/tests/test-obsolete.t	Wed Sep 27 01:27:40 2017 +0200
@@ -694,7 +694,7 @@
   $ hg up --hidden 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory parent is obsolete! (4538525df7e2)
-  (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
+  (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
   $ hg export 9468a5f5d8b2 | hg import -
   applying patch from stdin
   1 new unstable changesets
evolve