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-content-divergent-interrupted.t
changeset 5345 a73cdef2e33f
parent 5341 13376ca93fa3
child 5349 e8660b28bfee 
--- a/tests/test-evolve-content-divergent-interrupted.t	Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-content-divergent-interrupted.t	Fri May 08 04:02:22 2020 +0200
@@ -197,7 +197,7 @@
   merge:[5] added d
   with: [7] added d
   base: [4] added d
-  rebasing "divergent" content-divergent changeset e49523854bc8 on 0194d1974f1a
+  rebasing "divergent" content-divergent changeset e49523854bc8 on 4566502c0483
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
evolve