--- a/tests/test-evolve-content-divergent-interrupted.t Wed Apr 08 01:16:57 2020 +0800
+++ b/tests/test-evolve-content-divergent-interrupted.t Fri May 08 20:36:32 2020 +0800
@@ -197,7 +197,7 @@
merge:[5] added d
with: [7] added d
base: [4] added d
- rebasing "divergent" content-divergent changeset e49523854bc8 on ddcf04e1458c
+ 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
@@ -237,15 +237,15 @@
$ hg obslog -r . --all
* 2ba73e31f264 (8) added c
+ | amended(content) from ca1b80f7960a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
| @ 491e10505bae (10) added c
+ | | amended(content) from 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 7398f702a162 (9) added c
- |/ amended(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ amended(content) from ca1b80f7960a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x ca1b80f7960a (3) added c
- amended(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- amended(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
$ cd ..