23 

    23 

    24   $ touch bar

    24   $ touch bar

    25   $ hg ci -qAm 'add bar'

    25   $ hg ci -qAm 'add bar'

    26 

    26 

    27   $ hg merge --debug

    27   $ hg merge --debug

    29     unmatched files in local:

    28     unmatched files in local:

    30      bar

    29      bar

    31   resolving manifests

    30   resolving manifests

    32    branchmerge: True, force: False, partial: False

    31    branchmerge: True, force: False, partial: False

    33    ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee

    32    ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee