tests/test-rename-merge2.t
branchstable
changeset 19095 5cc71484ee9c
parent 18634 4b5d37ca3c11
child 20637 73a3a2386654
equal deleted inserted replaced
19094:fc1b77db123f 19095:5cc71484ee9c
   288    a: other deleted -> r
   288    a: other deleted -> r
   289    b: remote created -> g
   289    b: remote created -> g
   290    rev: versions differ -> m
   290    rev: versions differ -> m
   291     preserving rev for resolve of rev
   291     preserving rev for resolve of rev
   292   removing a
   292   removing a
       
   293   updating: a 1/3 files (33.33%)
   293   getting b
   294   getting b
   294   updating: b 2/3 files (66.67%)
   295   updating: b 2/3 files (66.67%)
   295   updating: rev 3/3 files (100.00%)
   296   updating: rev 3/3 files (100.00%)
   296   picked tool 'python ../merge' for rev (binary False symlink False)
   297   picked tool 'python ../merge' for rev (binary False symlink False)
   297   merging rev
   298   merging rev