equal
deleted
inserted
replaced
44 overwrite True partial False |
44 overwrite True partial False |
45 ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8 |
45 ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8 |
46 side2: other deleted -> r |
46 side2: other deleted -> r |
47 side1: other deleted -> r |
47 side1: other deleted -> r |
48 main: remote created -> g |
48 main: remote created -> g |
49 update: side1 1/3 files (33.33%) |
49 updating: side1 1/3 files (33.33%) |
50 removing side1 |
50 removing side1 |
51 update: side2 2/3 files (66.67%) |
51 updating: side2 2/3 files (66.67%) |
52 removing side2 |
52 removing side2 |
53 update: main 3/3 files (100.00%) |
53 updating: main 3/3 files (100.00%) |
54 getting main |
54 getting main |
55 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
55 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
56 Should only show a main |
56 Should only show a main |
57 a |
57 a |
58 main |
58 main |