tests/test-rename-dir-merge2.out
changeset 5610 2493a478f395
parent 4416 bb1800a7d7e1
child 6338 0750f11152fe
equal deleted inserted replaced
5609:a783d3627144 5610:2493a478f395
     1 adding a/f
     1 adding a/f
     2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     3 copying a/f to b/f
     3 moving a/f to b/f
     4 removing a/f
       
     5 adding a/aa/g
     4 adding a/aa/g
     6 pulling from ../r2
     5 pulling from ../r2
     7 searching for changes
     6 searching for changes
     8 adding changesets
     7 adding changesets
     9 adding manifests
     8 adding manifests