4 resolving manifests

     4 resolving manifests

     5  overwrite None branchmerge True partial False

     5  overwrite None branchmerge True partial False

     6  ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c

     6  ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c

     7  a: remote moved -> c

     7  a: remote moved -> c

     8  b2: remote created -> g

     8  b2: remote created -> g

     9 resolving a

    10 resolving a

    10 my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c

    11 my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c

    11 copying a to b

    12 copying a to b

    12 removing a

    13 removing a

    13 getting b2

    14 getting b2