equal
deleted
inserted
replaced
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3 merge |
3 merge |
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 -> m |
8 b2: remote created -> g |
8 b2: remote created -> g |
9 merging a and b to b |
9 merging a and b to b |
10 resolving a |
10 resolving a |
11 my a@. other b@8e765a822af2 ancestor a@af1939970a1c |
11 my a@. other b@8e765a822af2 ancestor a@af1939970a1c |
12 copying a to b |
12 copying a to b |