equal
deleted
inserted
replaced
40 side1 |
40 side1 |
41 side2 |
41 side2 |
42 resolving manifests |
42 resolving manifests |
43 overwrite True branchmerge False partial False |
43 overwrite True branchmerge False partial False |
44 ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d |
44 ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d |
45 remote deleted side2, clobbering |
45 side2: remote deleted -> r |
46 remote deleted side1, clobbering |
46 side1: remote deleted -> r |
47 remote created main |
47 main: remote created -> g |
48 getting main |
48 getting main |
49 removing side1 |
49 removing side1 |
50 removing side2 |
50 removing side2 |
51 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
51 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
52 Should only show a main |
52 Should only show a main |