changeset 34661 | eb586ed5d8ce |
parent 16913 | f2719b387380 |
child 38171 | eb9835014d20 |
--- a/tests/test-rename-after-merge.t Fri Oct 13 21:36:10 2017 +0900 +++ b/tests/test-rename-after-merge.t Thu Oct 12 09:39:50 2017 +0200 @@ -35,6 +35,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) + new changesets d2ae7f538514 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge