35   resolving manifests

    35   resolving manifests

    36    branchmerge: True, force: False, partial: False

    36    branchmerge: True, force: False, partial: False

    37    ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104

    37    ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104

    38    preserving foo for resolve of bar

    38    preserving foo for resolve of bar

    39    preserving foo for resolve of foo

    39    preserving foo for resolve of foo

    40    bar: remote copied from foo -> m (premerge)

    41    bar: remote copied from foo -> m (premerge)

    41   picked tool ':merge' for bar (binary False symlink False changedelete False)

    42   picked tool ':merge' for bar (binary False symlink False changedelete False)

    42   merging foo and bar to bar

    43   merging foo and bar to bar

    43   my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc

    44   my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc

    44    premerge successful

    45    premerge successful