5  overwrite None partial False

     5  overwrite None partial False

     6  ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2

     6  ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2

     7  a2: divergent renames -> dr

     7  a2: divergent renames -> dr

     8  a: remote moved to b -> m

     8  a: remote moved to b -> m

     9  b2: remote created -> g

     9  b2: remote created -> g

    10 merging a and b

    11 merging a and b

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

    12 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c

    13 removing a

    13 removing a

    14 warning: detected divergent renames of a2 to:

    14 warning: detected divergent renames of a2 to:

    15  c2

    15  c2

    16  b2

    16  b2

    17 getting b2

    17 getting b2