tests/test-rename-merge1.out
changeset 3155 c82ea81d6850
child 3257 c93ce7f10f85
equal deleted inserted replaced
3154:15d585dcdd1c 3155:c82ea81d6850
       
     1 checkout
       
     2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
       
     3 merge
       
     4 resolving manifests
       
     5  overwrite None branchmerge True partial False
       
     6  ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
       
     7  b: remote created -> g
       
     8  b2: remote created -> g
       
     9 getting b
       
    10 getting b2
       
    11 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    12 (branch merge, don't forget to commit)
       
    13 blahblah
       
    14 foo