diff -r ee7e4e05ce44 -r 7978230faa32 tests/test-evolve-content-divergence-meta.t --- a/tests/test-evolve-content-divergence-meta.t Wed Apr 10 15:26:41 2019 +0200 +++ b/tests/test-evolve-content-divergence-meta.t Wed Apr 10 15:37:29 2019 +0200 @@ -89,14 +89,14 @@ updating to "local" side of the conflict: 0c9267e23c9d merging "other" content-divergent changeset '6c06cda6dc99' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 7d41fb83d892 + working directory is now at 443bd2972210 Make sure resultant cset don't replace the initial user with user running the command: $ hg log -r tip - changeset: 5:7d41fb83d892 + changeset: 5:443bd2972210 tag: tip parent: 1:1740ad2a1eda - user: bar + user: foo date: Thu Jan 01 00:00:00 1970 +0000 summary: added c e