equal
deleted
inserted
replaced
15 summary: 1 |
15 summary: 1 |
16 |
16 |
17 resolving manifests |
17 resolving manifests |
18 overwrite False partial False |
18 overwrite False partial False |
19 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
19 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
|
20 searching for copies back to rev 1 |
|
21 unmatched files in other: |
|
22 b |
20 a: versions differ -> m |
23 a: versions differ -> m |
21 b: remote created -> g |
24 b: remote created -> g |
22 merging a |
25 merging a |
23 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
26 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
24 getting b |
27 getting b |
48 summary: 1 |
51 summary: 1 |
49 |
52 |
50 resolving manifests |
53 resolving manifests |
51 overwrite False partial False |
54 overwrite False partial False |
52 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
55 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
|
56 searching for copies back to rev 1 |
|
57 unmatched files in other: |
|
58 b |
53 a: versions differ -> m |
59 a: versions differ -> m |
54 b: remote created -> g |
60 b: remote created -> g |
55 merging a |
61 merging a |
56 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
62 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
57 getting b |
63 getting b |
98 abort: outstanding uncommitted changes |
104 abort: outstanding uncommitted changes |
99 failed |
105 failed |
100 resolving manifests |
106 resolving manifests |
101 overwrite False partial False |
107 overwrite False partial False |
102 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
108 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
|
109 searching for copies back to rev 1 |
103 a: versions differ -> m |
110 a: versions differ -> m |
104 b: versions differ -> m |
111 b: versions differ -> m |
105 merging a |
112 merging a |
106 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
113 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
107 merging b |
114 merging b |