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

    30   resolving manifests

    28   resolving manifests

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

    29    branchmerge: True, force: False, partial: False

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

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

    33    foo: remote is newer -> g

    31    foo: remote is newer -> g

    34   getting foo

    32   getting foo