changeset 4576 | 96ce1030d2fb |
parent 4490 | 7a5c6109ee84 |
child 4675 | 79bc0f1a832e |
child 4676 | b6c819facbe8 |
--- a/tests/test-unstability-resolution-result.t Wed Apr 24 15:57:49 2019 +0200 +++ b/tests/test-unstability-resolution-result.t Sun Apr 14 02:18:19 2019 +0800 @@ -85,7 +85,7 @@ $ echo 'a' > a $ hg amend 1 new orphan changesets - $ hg evolve + $ hg evolve --update move:[4] newer a atop:[5] changea merging a