tests/test-merge6.t
changeset 38249 1e9c357d3ddf
parent 38171 eb9835014d20
child 38250 d0abd7949ea3
equal deleted inserted replaced
38248:99ab72b867b7 38249:1e9c357d3ddf
    40   adding changesets
    40   adding changesets
    41   adding manifests
    41   adding manifests
    42   adding file changes
    42   adding file changes
    43   added 1 changesets with 1 changes to 1 files (+1 heads)
    43   added 1 changesets with 1 changes to 1 files (+1 heads)
    44   new changesets b90e70beeb58
    44   new changesets b90e70beeb58
    45   1 changesets became public
    45   1 local changesets became public
    46   (run 'hg heads' to see heads, 'hg merge' to merge)
    46   (run 'hg heads' to see heads, 'hg merge' to merge)
    47   $ hg merge
    47   $ hg merge
    48   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    48   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    49   (branch merge, don't forget to commit)
    49   (branch merge, don't forget to commit)
    50   $ hg commit -m "commit test"
    50   $ hg commit -m "commit test"