equal
deleted
inserted
replaced
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 removing side1 |
74 removing side1 |
75 updating: side1 1/3 files (33.33%) |
|
76 removing side2 |
75 removing side2 |
77 updating: side2 2/3 files (66.67%) |
|
78 getting main |
76 getting main |
79 updating: main 3/3 files (100.00%) |
77 updating: main 3/3 files (100.00%) |
80 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
78 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
81 |
79 |
82 $ ls |
80 $ ls |