26 resolving manifests

    26 resolving manifests

    27  overwrite None partial False

    27  overwrite None partial False

    28  ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1

    28  ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1

    29  bar: versions differ -> m

    29  bar: versions differ -> m

    30 preserving bar for resolve of bar

    30 preserving bar for resolve of bar

    31 picked tool 'internal:merge' for bar (binary False symlink False)

    32 picked tool 'internal:merge' for bar (binary False symlink False)

    32 merging bar

    33 merging bar

    33 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510

    34 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510

    34  premerge successful

    35  premerge successful

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

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

    76 resolving manifests

    77 resolving manifests

    77  overwrite None partial False

    78  overwrite None partial False

    78  ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897

    79  ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897

    79  bar: versions differ -> m

    80  bar: versions differ -> m

    80 preserving bar for resolve of bar

    81 preserving bar for resolve of bar

    81 picked tool 'internal:merge' for bar (binary False symlink False)

    83 picked tool 'internal:merge' for bar (binary False symlink False)

    82 merging bar

    84 merging bar

    83 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510

    85 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510

    84  premerge successful

    86  premerge successful

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

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