tests/test-merge8.out
changeset 4311 4787e2b0dd03
parent 3674 9103dab96093
child 4416 bb1800a7d7e1
equal deleted inserted replaced
4273:8185a1ca8628 4311:4787e2b0dd03
     4 adding changesets
     4 adding changesets
     5 adding manifests
     5 adding manifests
     6 adding file changes
     6 adding file changes
     7 added 2 changesets with 2 changes to 1 files
     7 added 2 changesets with 2 changes to 1 files
     8 (run 'hg update' to get a working copy)
     8 (run 'hg update' to get a working copy)
     9 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
     9 merging a and b
       
    10 0 files updated, 1 files merged, 0 files removed, 0 files unresolved