equal
deleted
inserted
replaced
64 side1 |
64 side1 |
65 side2 |
65 side2 |
66 |
66 |
67 $ hg update --debug -C 1 |
67 $ hg update --debug -C 1 |
68 resolving manifests |
68 resolving manifests |
69 overwrite: True, partial: False |
69 branchmerge: False, force: True, partial: False |
70 ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf |
70 ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf |
71 side1: other deleted -> r |
71 side1: other deleted -> r |
72 side2: other deleted -> r |
72 side2: other deleted -> r |
73 main: remote created -> g |
73 main: remote created -> g |
74 updating: side1 1/3 files (33.33%) |
74 updating: side1 1/3 files (33.33%) |