39   searching for changes

    39   searching for changes

    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   (run 'hg heads' to see heads, 'hg merge' to merge)

    45   (run 'hg heads' to see heads, 'hg merge' to merge)

    45   $ hg merge

    46   $ hg merge

    46   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    47   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    47   (branch merge, don't forget to commit)

    48   (branch merge, don't forget to commit)

    48   $ hg commit -m "commit test"

    49   $ hg commit -m "commit test"

    56   searching for changes

    57   searching for changes

    57   adding changesets

    58   adding changesets

    58   adding manifests

    59   adding manifests

    59   adding file changes

    60   adding file changes

    60   added 1 changesets with 0 changes to 0 files (+1 heads)

    61   added 1 changesets with 0 changes to 0 files (+1 heads)

    61   (run 'hg heads' to see heads, 'hg merge' to merge)

    63   (run 'hg heads' to see heads, 'hg merge' to merge)

    62   $ hg merge

    64   $ hg merge

    63   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    65   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    64   (branch merge, don't forget to commit)

    66   (branch merge, don't forget to commit)

    65   $ hg commit -m "commit test"

    67   $ hg commit -m "commit test"