39   adding changesets

    39   adding changesets

    40   adding manifests

    40   adding manifests

    41   adding file changes

    41   adding file changes

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

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

    43   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    43   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    44   1 other heads for branch "default"

    45   1 other heads for branch "default"

    45 

    46 

    46   $ cd ../tt

    47   $ cd ../tt

    47 

    48 

    48 Should not update to the other branch:

    49 Should not update to the other branch:

    53   adding changesets

    54   adding changesets

    54   adding manifests

    55   adding manifests

    55   adding file changes

    56   adding file changes

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

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

    57   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    58   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    58   1 other heads for branch "default"

    60   1 other heads for branch "default"

    59 

    61 

    60   $ HGMERGE=true hg merge

    62   $ HGMERGE=true hg merge

    61   merging foo

    63   merging foo

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

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