tests/test-rename-dir-merge2.out
changeset 9611 a3d73b3e1f8a
parent 6338 0750f11152fe
equal deleted inserted replaced
9610:d78fe60f6bda 9611:a3d73b3e1f8a
     1 adding a/f
     1 adding a/f
     2 updating working directory
     2 updating to branch default
     3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     4 moving a/f to b/f
     4 moving a/f to b/f
     5 adding a/aa/g
     5 adding a/aa/g
     6 pulling from ../r2
     6 pulling from ../r2
     7 searching for changes
     7 searching for changes