diff tests/test-evolve-content-divergent-case-A3.t @ 6396:e5bd76f95145 mercurial-5.5

test-compat: merge mercurial-5.6 into mercurial-5.5

--- a/tests/test-evolve-content-divergent-case-A3.t	Thu Dec 08 20:35:02 2022 +0400
+++ b/tests/test-evolve-content-divergent-case-A3.t	Mon Feb 06 21:38:31 2023 +0400
@@ -125,10 +125,10 @@
   base: [3] C
   rebasing "other" content-divergent changeset 710d96992b40 on f6fbb35d8ac9
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 3ad062d48137
+  working directory is now at b341bfa8675e
 
   $ hg log -G
-  @  7:3ad062d48137 (draft): C
+  @  7:b341bfa8675e (draft): C
   |
   o  2:f6fbb35d8ac9 (draft): B
   |
@@ -137,8 +137,8 @@
   o  0:a9bdc8b26820 (public): O
   
   $ hg log -pl 1
-  7:3ad062d48137 (draft): C 
-  diff -r f6fbb35d8ac9 -r 3ad062d48137 C
+  7:b341bfa8675e (draft): C 
+  diff -r f6fbb35d8ac9 -r b341bfa8675e C
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/C	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -178,10 +178,10 @@
   base: [3] C
   rebasing "divergent" content-divergent changeset 710d96992b40 on f6fbb35d8ac9
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 8f91b97f6f9a
+  working directory is now at 0de314083dd2
 
   $ hg log -G
-  @  7:8f91b97f6f9a (draft): C
+  @  7:0de314083dd2 (draft): C
   |
   o  2:f6fbb35d8ac9 (draft): B
   |
@@ -192,8 +192,8 @@
   $ hg evolve -l
 
   $ hg log -pl1
-  7:8f91b97f6f9a (draft): C 
-  diff -r f6fbb35d8ac9 -r 8f91b97f6f9a C
+  7:0de314083dd2 (draft): C 
+  diff -r f6fbb35d8ac9 -r 0de314083dd2 C
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/C	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@