equal
deleted
inserted
replaced
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c |
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c |
7 a: remote moved -> c |
7 a: remote moved -> c |
8 b2: remote created -> g |
8 b2: remote created -> g |
9 merging a and b to b |
9 merging a and b to b |
10 resolving a |
10 resolving a |
11 my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c |
11 my a@. other b@8e765a822af2 ancestor a@af1939970a1c |
12 copying a to b |
12 copying a to b |
13 removing a |
13 removing a |
14 getting b2 |
14 getting b2 |
15 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
15 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
16 (branch merge, don't forget to commit) |
16 (branch merge, don't forget to commit) |