tests/test-merge6.out
changeset 5405 8feb33c2d153
parent 2175 b2ae81a7df29
equal deleted inserted replaced
5404:67d3daa8ac42 5405:8feb33c2d153
     9 added 1 changesets with 1 changes to 1 files (+1 heads)
     9 added 1 changesets with 1 changes to 1 files (+1 heads)
    10 (run 'hg heads' to see heads, 'hg merge' to merge)
    10 (run 'hg heads' to see heads, 'hg merge' to merge)
    11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    12 (branch merge, don't forget to commit)
    12 (branch merge, don't forget to commit)
    13 bar should remain deleted.
    13 bar should remain deleted.
    14 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
    14 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo
    15 pulling from ../A2
    15 pulling from ../A2
    16 searching for changes
    16 searching for changes
    17 adding changesets
    17 adding changesets
    18 adding manifests
    18 adding manifests
    19 adding file changes
    19 adding file changes
    20 added 1 changesets with 0 changes to 0 files (+1 heads)
    20 added 1 changesets with 0 changes to 0 files (+1 heads)
    21 (run 'hg heads' to see heads, 'hg merge' to merge)
    21 (run 'hg heads' to see heads, 'hg merge' to merge)
    22 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    22 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    23 (branch merge, don't forget to commit)
    23 (branch merge, don't forget to commit)
    24 bar should remain deleted.
    24 bar should remain deleted.
    25 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
    25 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo