--- a/tests/test-evolve-content-divergent-first-changeset.t Wed Apr 08 01:17:01 2020 +0800
+++ b/tests/test-evolve-content-divergent-first-changeset.t Fri May 08 22:50:09 2020 +0800
@@ -6,6 +6,7 @@
> evolution.allowdivergence = True
> EOF
+
This test file tests the case of content-divergence resolution of changesets
that have the null revision as the parent.
@@ -40,6 +41,6 @@
with: [2] div2
base: [0] test
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
- working directory is now at 12772224141b
+ working directory is now at 62fcb3488421
$ hg evolve --list