31   (use 'hg update' or merge with an explicit revision)

    31   (use 'hg update' or merge with an explicit revision)

    32   [255]

    32   [255]

    33 

    33 

    34   $ hg up

    34   $ hg up

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

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

    36   2 other heads for branch "default"

    37   2 other heads for branch "default"

    37 

    38 

    38 Should fail because > 2 heads:

    39 Should fail because > 2 heads:

    39 

    40 

    40   $ HGMERGE=internal:other; export HGMERGE

    41   $ HGMERGE=internal:other; export HGMERGE