|
@@
-8,11
+8,11
b' resolving manifests'
|
|
8
|
8
|
a: remote copied -> c
|
|
9
|
9
|
merging a and b to b
|
|
10
|
10
|
resolving a
|
|
11
|
|
my a@e300d1c794ec other b@735846fee2d7 ancestor a@924404dff337
|
|
|
11
|
my a@. other b@735846fee2d7 ancestor a@924404dff337
|
|
12
|
12
|
copying a to b
|
|
13
|
13
|
merging rev
|
|
14
|
14
|
resolving rev
|
|
15
|
|
my rev@e300d1c794ec other rev@735846fee2d7 ancestor rev@924404dff337
|
|
|
15
|
my rev@. other rev@735846fee2d7 ancestor rev@924404dff337
|
|
16
|
16
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
17
|
17
|
(branch merge, don't forget to commit)
|
|
18
|
18
|
--------------
|
|
@@
-33,10
+33,10
b' resolving manifests'
|
|
33
|
33
|
getting a
|
|
34
|
34
|
merging b and a to b
|
|
35
|
35
|
resolving b
|
|
36
|
|
my b@ac809aeed39a other a@f4db7e329e71 ancestor a@924404dff337
|
|
|
36
|
my b@. other a@f4db7e329e71 ancestor a@924404dff337
|
|
37
|
37
|
merging rev
|
|
38
|
38
|
resolving rev
|
|
39
|
|
my rev@ac809aeed39a other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
|
39
|
my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
40
|
40
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
41
|
41
|
(branch merge, don't forget to commit)
|
|
42
|
42
|
--------------
|
|
@@
-55,12
+55,12
b' resolving manifests'
|
|
55
|
55
|
rev: versions differ -> m
|
|
56
|
56
|
merging a and b to b
|
|
57
|
57
|
resolving a
|
|
58
|
|
my a@e300d1c794ec other b@e03727d2d66b ancestor a@924404dff337
|
|
|
58
|
my a@. other b@e03727d2d66b ancestor a@924404dff337
|
|
59
|
59
|
copying a to b
|
|
60
|
60
|
removing a
|
|
61
|
61
|
merging rev
|
|
62
|
62
|
resolving rev
|
|
63
|
|
my rev@e300d1c794ec other rev@e03727d2d66b ancestor rev@924404dff337
|
|
|
63
|
my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
|
|
64
|
64
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
65
|
65
|
(branch merge, don't forget to commit)
|
|
66
|
66
|
--------------
|
|
@@
-78,10
+78,10
b' resolving manifests'
|
|
78
|
78
|
rev: versions differ -> m
|
|
79
|
79
|
merging b and a to b
|
|
80
|
80
|
resolving b
|
|
81
|
|
my b@ecf3cb2a4219 other a@f4db7e329e71 ancestor a@924404dff337
|
|
|
81
|
my b@. other a@f4db7e329e71 ancestor a@924404dff337
|
|
82
|
82
|
merging rev
|
|
83
|
83
|
resolving rev
|
|
84
|
|
my rev@ecf3cb2a4219 other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
|
84
|
my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
85
|
85
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
86
|
86
|
(branch merge, don't forget to commit)
|
|
87
|
87
|
--------------
|
|
@@
-99,11
+99,11
b' resolving manifests'
|
|
99
|
99
|
a: remote copied -> c
|
|
100
|
100
|
merging a and b to b
|
|
101
|
101
|
resolving a
|
|
102
|
|
my a@924404dff337 other b@735846fee2d7 ancestor a@924404dff337
|
|
|
102
|
my a@. other b@735846fee2d7 ancestor a@924404dff337
|
|
103
|
103
|
copying a to b
|
|
104
|
104
|
merging rev
|
|
105
|
105
|
resolving rev
|
|
106
|
|
my rev@94b33a1b7f2d other rev@735846fee2d7 ancestor rev@924404dff337
|
|
|
106
|
my rev@. other rev@735846fee2d7 ancestor rev@924404dff337
|
|
107
|
107
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
108
|
108
|
(branch merge, don't forget to commit)
|
|
109
|
109
|
--------------
|
|
@@
-122,10
+122,10
b' resolving manifests'
|
|
122
|
122
|
rev: versions differ -> m
|
|
123
|
123
|
merging b and a to b
|
|
124
|
124
|
resolving b
|
|
125
|
|
my b@ac809aeed39a other a@924404dff337 ancestor a@924404dff337
|
|
|
125
|
my b@. other a@97c705ade336 ancestor a@924404dff337
|
|
126
|
126
|
merging rev
|
|
127
|
127
|
resolving rev
|
|
128
|
|
my rev@ac809aeed39a other rev@97c705ade336 ancestor rev@924404dff337
|
|
|
128
|
my rev@. other rev@97c705ade336 ancestor rev@924404dff337
|
|
129
|
129
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
130
|
130
|
(branch merge, don't forget to commit)
|
|
131
|
131
|
--------------
|
|
@@
-144,12
+144,12
b' resolving manifests'
|
|
144
|
144
|
rev: versions differ -> m
|
|
145
|
145
|
merging a and b to b
|
|
146
|
146
|
resolving a
|
|
147
|
|
my a@924404dff337 other b@e03727d2d66b ancestor a@924404dff337
|
|
|
147
|
my a@. other b@e03727d2d66b ancestor a@924404dff337
|
|
148
|
148
|
copying a to b
|
|
149
|
149
|
removing a
|
|
150
|
150
|
merging rev
|
|
151
|
151
|
resolving rev
|
|
152
|
|
my rev@94b33a1b7f2d other rev@e03727d2d66b ancestor rev@924404dff337
|
|
|
152
|
my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
|
|
153
|
153
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
154
|
154
|
(branch merge, don't forget to commit)
|
|
155
|
155
|
--------------
|
|
@@
-167,10
+167,10
b' resolving manifests'
|
|
167
|
167
|
rev: versions differ -> m
|
|
168
|
168
|
merging b and a to b
|
|
169
|
169
|
resolving b
|
|
170
|
|
my b@ecf3cb2a4219 other a@924404dff337 ancestor a@924404dff337
|
|
|
170
|
my b@. other a@97c705ade336 ancestor a@924404dff337
|
|
171
|
171
|
merging rev
|
|
172
|
172
|
resolving rev
|
|
173
|
|
my rev@ecf3cb2a4219 other rev@97c705ade336 ancestor rev@924404dff337
|
|
|
173
|
my rev@. other rev@97c705ade336 ancestor rev@924404dff337
|
|
174
|
174
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
175
|
175
|
(branch merge, don't forget to commit)
|
|
176
|
176
|
--------------
|
|
@@
-188,10
+188,10
b' resolving manifests'
|
|
188
|
188
|
rev: versions differ -> m
|
|
189
|
189
|
merging b
|
|
190
|
190
|
resolving b
|
|
191
|
|
my b@ec03c2ca8642 other b@79cc6877a3b7 ancestor a@924404dff337
|
|
|
191
|
my b@. other b@79cc6877a3b7 ancestor a@924404dff337
|
|
192
|
192
|
merging rev
|
|
193
|
193
|
resolving rev
|
|
194
|
|
my rev@ec03c2ca8642 other rev@79cc6877a3b7 ancestor rev@924404dff337
|
|
|
194
|
my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337
|
|
195
|
195
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
196
|
196
|
(branch merge, don't forget to commit)
|
|
197
|
197
|
--------------
|
|
@@
-209,7
+209,7
b' resolving manifests'
|
|
209
|
209
|
getting c
|
|
210
|
210
|
merging rev
|
|
211
|
211
|
resolving rev
|
|
212
|
|
my rev@ecf3cb2a4219 other rev@e6abcc1a30c2 ancestor rev@924404dff337
|
|
|
212
|
my rev@. other rev@e6abcc1a30c2 ancestor rev@924404dff337
|
|
213
|
213
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
214
|
214
|
(branch merge, don't forget to commit)
|
|
215
|
215
|
--------------
|
|
@@
-227,10
+227,10
b' resolving manifests'
|
|
227
|
227
|
rev: versions differ -> m
|
|
228
|
228
|
merging b
|
|
229
|
229
|
resolving b
|
|
230
|
|
my b@ac809aeed39a other b@af30c7647fc7 ancestor b@000000000000
|
|
|
230
|
my b@. other b@af30c7647fc7 ancestor b@000000000000
|
|
231
|
231
|
merging rev
|
|
232
|
232
|
resolving rev
|
|
233
|
|
my rev@ac809aeed39a other rev@af30c7647fc7 ancestor rev@924404dff337
|
|
|
233
|
my rev@. other rev@af30c7647fc7 ancestor rev@924404dff337
|
|
234
|
234
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
235
|
235
|
(branch merge, don't forget to commit)
|
|
236
|
236
|
--------------
|
|
@@
-250,10
+250,10
b' resolving manifests'
|
|
250
|
250
|
removing a
|
|
251
|
251
|
merging b
|
|
252
|
252
|
resolving b
|
|
253
|
|
my b@59318016310c other b@e03727d2d66b ancestor b@000000000000
|
|
|
253
|
my b@. other b@e03727d2d66b ancestor b@000000000000
|
|
254
|
254
|
merging rev
|
|
255
|
255
|
resolving rev
|
|
256
|
|
my rev@59318016310c other rev@e03727d2d66b ancestor rev@924404dff337
|
|
|
256
|
my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
|
|
257
|
257
|
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
|
|
258
|
258
|
(branch merge, don't forget to commit)
|
|
259
|
259
|
--------------
|
|
@@
-272,10
+272,10
b' resolving manifests'
|
|
272
|
272
|
getting a
|
|
273
|
273
|
merging b
|
|
274
|
274
|
resolving b
|
|
275
|
|
my b@ac809aeed39a other b@8dbce441892a ancestor b@000000000000
|
|
|
275
|
my b@. other b@8dbce441892a ancestor b@000000000000
|
|
276
|
276
|
merging rev
|
|
277
|
277
|
resolving rev
|
|
278
|
|
my rev@ac809aeed39a other rev@8dbce441892a ancestor rev@924404dff337
|
|
|
278
|
my rev@. other rev@8dbce441892a ancestor rev@924404dff337
|
|
279
|
279
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
280
|
280
|
(branch merge, don't forget to commit)
|
|
281
|
281
|
--------------
|
|
@@
-295,10
+295,10
b' resolving manifests'
|
|
295
|
295
|
removing a
|
|
296
|
296
|
merging b
|
|
297
|
297
|
resolving b
|
|
298
|
|
my b@59318016310c other b@e03727d2d66b ancestor b@000000000000
|
|
|
298
|
my b@. other b@e03727d2d66b ancestor b@000000000000
|
|
299
|
299
|
merging rev
|
|
300
|
300
|
resolving rev
|
|
301
|
|
my rev@59318016310c other rev@e03727d2d66b ancestor rev@924404dff337
|
|
|
301
|
my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
|
|
302
|
302
|
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
|
|
303
|
303
|
(branch merge, don't forget to commit)
|
|
304
|
304
|
--------------
|
|
@@
-317,10
+317,10
b' resolving manifests'
|
|
317
|
317
|
getting a
|
|
318
|
318
|
merging b
|
|
319
|
319
|
resolving b
|
|
320
|
|
my b@ac809aeed39a other b@8dbce441892a ancestor b@000000000000
|
|
|
320
|
my b@. other b@8dbce441892a ancestor b@000000000000
|
|
321
|
321
|
merging rev
|
|
322
|
322
|
resolving rev
|
|
323
|
|
my rev@ac809aeed39a other rev@8dbce441892a ancestor rev@924404dff337
|
|
|
323
|
my rev@. other rev@8dbce441892a ancestor rev@924404dff337
|
|
324
|
324
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
325
|
325
|
(branch merge, don't forget to commit)
|
|
326
|
326
|
--------------
|
|
@@
-338,10
+338,10
b' resolving manifests'
|
|
338
|
338
|
rev: versions differ -> m
|
|
339
|
339
|
merging b
|
|
340
|
340
|
resolving b
|
|
341
|
|
my b@0b76e65c8289 other b@735846fee2d7 ancestor b@000000000000
|
|
|
341
|
my b@. other b@735846fee2d7 ancestor b@000000000000
|
|
342
|
342
|
merging rev
|
|
343
|
343
|
resolving rev
|
|
344
|
|
my rev@0b76e65c8289 other rev@735846fee2d7 ancestor rev@924404dff337
|
|
|
344
|
my rev@. other rev@735846fee2d7 ancestor rev@924404dff337
|
|
345
|
345
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
346
|
346
|
(branch merge, don't forget to commit)
|
|
347
|
347
|
--------------
|
|
@@
-361,10
+361,10
b' resolving manifests'
|
|
361
|
361
|
getting a
|
|
362
|
362
|
merging b
|
|
363
|
363
|
resolving b
|
|
364
|
|
my b@ecf3cb2a4219 other b@8dbce441892a ancestor b@000000000000
|
|
|
364
|
my b@. other b@8dbce441892a ancestor b@000000000000
|
|
365
|
365
|
merging rev
|
|
366
|
366
|
resolving rev
|
|
367
|
|
my rev@ecf3cb2a4219 other rev@8dbce441892a ancestor rev@924404dff337
|
|
|
367
|
my rev@. other rev@8dbce441892a ancestor rev@924404dff337
|
|
368
|
368
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
369
|
369
|
(branch merge, don't forget to commit)
|
|
370
|
370
|
--------------
|
|
@@
-382,10
+382,10
b' resolving manifests'
|
|
382
|
382
|
rev: versions differ -> m
|
|
383
|
383
|
merging b
|
|
384
|
384
|
resolving b
|
|
385
|
|
my b@0b76e65c8289 other b@e03727d2d66b ancestor b@000000000000
|
|
|
385
|
my b@. other b@e03727d2d66b ancestor b@000000000000
|
|
386
|
386
|
merging rev
|
|
387
|
387
|
resolving rev
|
|
388
|
|
my rev@0b76e65c8289 other rev@e03727d2d66b ancestor rev@924404dff337
|
|
|
388
|
my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
|
|
389
|
389
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
390
|
390
|
(branch merge, don't forget to commit)
|
|
391
|
391
|
--------------
|
|
@@
-403,12
+403,12
b' resolving manifests'
|
|
403
|
403
|
rev: versions differ -> m
|
|
404
|
404
|
merging a and b to b
|
|
405
|
405
|
resolving a
|
|
406
|
|
my a@e300d1c794ec other b@79cc6877a3b7 ancestor a@924404dff337
|
|
|
406
|
my a@. other b@79cc6877a3b7 ancestor a@924404dff337
|
|
407
|
407
|
copying a to b
|
|
408
|
408
|
removing a
|
|
409
|
409
|
merging rev
|
|
410
|
410
|
resolving rev
|
|
411
|
|
my rev@e300d1c794ec other rev@79cc6877a3b7 ancestor rev@924404dff337
|
|
|
411
|
my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337
|
|
412
|
412
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
413
|
413
|
(branch merge, don't forget to commit)
|
|
414
|
414
|
--------------
|
|
@@
-426,10
+426,10
b' resolving manifests'
|
|
426
|
426
|
rev: versions differ -> m
|
|
427
|
427
|
merging b and a to b
|
|
428
|
428
|
resolving b
|
|
429
|
|
my b@ec03c2ca8642 other a@f4db7e329e71 ancestor a@924404dff337
|
|
|
429
|
my b@. other a@f4db7e329e71 ancestor a@924404dff337
|
|
430
|
430
|
merging rev
|
|
431
|
431
|
resolving rev
|
|
432
|
|
my rev@ec03c2ca8642 other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
|
432
|
my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337
|
|
433
|
433
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
434
|
434
|
(branch merge, don't forget to commit)
|
|
435
|
435
|
--------------
|
|
@@
-448,11
+448,11
b' resolving manifests'
|
|
448
|
448
|
c: remote created -> g
|
|
449
|
449
|
merging b and a to b
|
|
450
|
450
|
resolving b
|
|
451
|
|
my b@ecf3cb2a4219 other a@2b958612230f ancestor a@924404dff337
|
|
|
451
|
my b@. other a@2b958612230f ancestor a@924404dff337
|
|
452
|
452
|
getting c
|
|
453
|
453
|
merging rev
|
|
454
|
454
|
resolving rev
|
|
455
|
|
my rev@ecf3cb2a4219 other rev@2b958612230f ancestor rev@924404dff337
|
|
|
455
|
my rev@. other rev@2b958612230f ancestor rev@924404dff337
|
|
456
|
456
|
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
457
|
457
|
(branch merge, don't forget to commit)
|
|
458
|
458
|
--------------
|