equal
deleted
inserted
replaced
17 b2 -> a2 ! |
17 b2 -> a2 ! |
18 checking for directory renames |
18 checking for directory renames |
19 a2: divergent renames -> dr |
19 a2: divergent renames -> dr |
20 a: remote moved to b -> m |
20 a: remote moved to b -> m |
21 b2: remote created -> g |
21 b2: remote created -> g |
22 copying a to b |
22 preserving a for resolve of b |
23 picked tool 'internal:merge' for a (binary False symlink False) |
23 removing a |
24 merging a and b |
24 picked tool 'internal:merge' for b (binary False symlink False) |
25 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c |
25 merging a and b to b |
|
26 my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c |
26 premerge successful |
27 premerge successful |
27 removing a |
|
28 warning: detected divergent renames of a2 to: |
28 warning: detected divergent renames of a2 to: |
29 c2 |
29 c2 |
30 b2 |
30 b2 |
31 getting b2 |
31 getting b2 |
32 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
32 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |