equal
deleted
inserted
replaced
34 resolving manifests |
34 resolving manifests |
35 branchmerge: True, force: False, partial: False |
35 branchmerge: True, force: False, partial: False |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
37 1: other deleted -> r |
37 1: other deleted -> r |
38 1a: remote created -> g |
38 1a: remote created -> g |
|
39 2: keep -> k |
39 removing 1 |
40 removing 1 |
40 updating: 1 1/2 files (50.00%) |
41 updating: 1 1/2 files (50.00%) |
41 getting 1a |
42 getting 1a |
42 updating: 1a 2/2 files (100.00%) |
43 updating: 1a 2/2 files (100.00%) |
43 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
44 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |