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-evolve-obshistory-content-divergent.t
branchmercurial-4.5
changeset 4205 6be09fb2c08c
parent 3924 f3713d41b85b
child 3930 d00f0c369bc7 
--- a/tests/test-evolve-obshistory-content-divergent.t	Thu Oct 25 13:03:30 2018 +0200
+++ b/tests/test-evolve-obshistory-content-divergent.t	Thu Oct 25 13:04:08 2018 +0200
@@ -333,8 +333,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' has diverged!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '471f378eab4c'!
+  (use --hidden to access hidden revisions; diverged)
   [255]
   $ hg update --hidden 'desc(A0)'
   updating to a hidden changeset 471f378eab4c
evolve