tests/test-rename-after-merge.out
changeset 5608 784eadabd985
parent 5318 c6682cdada2f
child 6338 0750f11152fe
equal deleted inserted replaced
5607:e9bae5c80ab4 5608:784eadabd985
    12 adding file changes
    12 adding file changes
    13 added 1 changesets with 1 changes to 1 files (+1 heads)
    13 added 1 changesets with 1 changes to 1 files (+1 heads)
    14 (run 'hg heads' to see heads, 'hg merge' to merge)
    14 (run 'hg heads' to see heads, 'hg merge' to merge)
    15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    16 (branch merge, don't forget to commit)
    16 (branch merge, don't forget to commit)
       
    17 M b
    17 % rename b as c
    18 % rename b as c
    18 A c
    19 A c
    19 R b
    20 R b
    20 % rename back c as b
    21 % rename back c as b
       
    22 M b