changeset 4576 | 96ce1030d2fb |
parent 4530 | d081cc4f5fef |
child 4583 | 4fcf9a71befc |
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Wed Apr 24 15:57:49 2019 +0200 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Sun Apr 14 02:18:19 2019 +0800 @@ -384,7 +384,7 @@ (No patch available, changesets rebased) - $ hg evolve --content-divergent --any + $ hg evolve --content-divergent --any --update merge:[5] added d with: [4] added c e base: [3] added d