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