31   searching for changes

    31   searching for changes

    32   adding changesets

    32   adding changesets

    33   adding manifests

    33   adding manifests

    34   adding file changes

    34   adding file changes

    35   added 1 changesets with 1 changes to 1 files (+1 heads)

    35   added 1 changesets with 1 changes to 1 files (+1 heads)

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

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

    37   $ hg up -C 2

    38   $ hg up -C 2

    38   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    39   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    39   $ hg merge

    40   $ hg merge

    40   merging testdir/subdir/a and testdir/a to testdir/subdir/a

    41   merging testdir/subdir/a and testdir/a to testdir/subdir/a