diff tests/test-evolve-content-divergent-interrupted.t @ 6391:9a41c3c293ae mercurial-6.0

test-compat: merge mercurial-6.1 into mercurial-6.0

--- a/tests/test-evolve-content-divergent-interrupted.t	Thu Dec 08 19:17:00 2022 +0400
+++ b/tests/test-evolve-content-divergent-interrupted.t	Mon Feb 06 18:38:36 2023 +0400
@@ -567,11 +567,11 @@
   $ hg next
   move:[5] added d
   atop:[8] added c
-  working directory is now at dc9ba677cba1
+  working directory is now at 543adc7eac82
   $ echo "latest_changes" >> a
   $ hg amend
   $ hg glog
-  @  10:0892835a581f added d
+  @  10:13a3da452f7f added d
   |   () draft content-divergent
   o  8:33c16a2e0eb8 added c
   |   () draft
@@ -588,7 +588,7 @@
   merge:[7] added d
   with: [10] added d
   base: [4] added d
-  rebasing "other" content-divergent changeset 0892835a581f on c7586e2a9264
+  rebasing "other" content-divergent changeset 13a3da452f7f on c7586e2a9264
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -605,7 +605,7 @@
   +=======
   +some_changes
   +latest_changes
-  +>>>>>>> evolving:    0892835a581f - test: added d
+  +>>>>>>> evolving:    13a3da452f7f - test: added d
   diff -r c7586e2a9264 d
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:00 1970 +0000
@@ -614,10 +614,10 @@
 
   $ hg evolve --stop
   stopped the interrupted evolve
-  working directory is now at 0892835a581f
+  working directory is now at 13a3da452f7f
 
   $ hg glog
-  @  10:0892835a581f added d
+  @  10:13a3da452f7f added d
   |   () draft content-divergent
   o  8:33c16a2e0eb8 added c
   |   () draft