|
1 adding 1 |
|
2 adding 2 |
|
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
4 resolving manifests |
|
5 overwrite None partial False |
|
6 ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c |
|
7 1: other deleted -> r |
|
8 1a: remote created -> g |
|
9 removing 1 |
|
10 getting 1a |
|
11 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
12 (branch merge, don't forget to commit) |
|
13 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
14 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
15 resolving manifests |
|
16 overwrite None partial False |
|
17 ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 |
|
18 1a: local moved to 1 -> m |
|
19 merging 1a and 1 |
|
20 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
|
21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
22 (branch merge, don't forget to commit) |
|
23 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
24 resolving manifests |
|
25 overwrite None partial False |
|
26 ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052 |
|
27 1: remote moved to 1a -> m |
|
28 copying 1 to 1a |
|
29 merging 1 and 1a |
|
30 my 1@746e9549ea96+ other 1a@2f8037f47a5c ancestor 1@81f4b099af3d |
|
31 removing 1 |
|
32 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
33 (branch merge, don't forget to commit) |