86 branchmerge: True, force: False, partial: False |
86 branchmerge: True, force: False, partial: False |
87 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
87 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
88 starting 4 threads for background file closing (?) |
88 starting 4 threads for background file closing (?) |
89 preserving a for resolve of b |
89 preserving a for resolve of b |
90 preserving rev for resolve of rev |
90 preserving rev for resolve of rev |
91 b: remote copied from a -> m (premerge) |
91 b: remote copied from a -> m |
92 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
92 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
93 merging a and b to b |
93 merging a and b to b |
94 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
94 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
95 premerge successful |
95 premerge successful |
96 rev: versions differ -> m (premerge) |
96 rev: versions differ -> m |
97 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
97 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
98 merging rev |
98 merging rev |
99 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
99 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
100 rev: versions differ -> m (merge) |
|
101 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
100 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
101 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
103 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
102 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
104 merge tool returned: 0 |
103 merge tool returned: 0 |
105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
104 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
126 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
125 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
127 a: remote is newer -> g |
126 a: remote is newer -> g |
128 getting a |
127 getting a |
129 preserving b for resolve of b |
128 preserving b for resolve of b |
130 preserving rev for resolve of rev |
129 preserving rev for resolve of rev |
131 b: local copied/moved from a -> m (premerge) |
130 b: local copied/moved from a -> m |
132 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
131 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
133 merging b and a to b |
132 merging b and a to b |
134 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
133 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
135 premerge successful |
134 premerge successful |
136 rev: versions differ -> m (premerge) |
135 rev: versions differ -> m |
137 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
136 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
138 merging rev |
137 merging rev |
139 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
138 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
140 rev: versions differ -> m (merge) |
|
141 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
139 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
142 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
140 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
143 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
141 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
144 merge tool returned: 0 |
142 merge tool returned: 0 |
145 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
143 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
166 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
164 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
167 starting 4 threads for background file closing (?) |
165 starting 4 threads for background file closing (?) |
168 preserving a for resolve of b |
166 preserving a for resolve of b |
169 preserving rev for resolve of rev |
167 preserving rev for resolve of rev |
170 removing a |
168 removing a |
171 b: remote moved from a -> m (premerge) |
169 b: remote moved from a -> m |
172 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
170 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
173 merging a and b to b |
171 merging a and b to b |
174 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
172 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
175 premerge successful |
173 premerge successful |
176 rev: versions differ -> m (premerge) |
174 rev: versions differ -> m |
177 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
175 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
178 merging rev |
176 merging rev |
179 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
177 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
180 rev: versions differ -> m (merge) |
|
181 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
178 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
182 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
179 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
183 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
180 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
184 merge tool returned: 0 |
181 merge tool returned: 0 |
185 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
182 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
204 branchmerge: True, force: False, partial: False |
201 branchmerge: True, force: False, partial: False |
205 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
202 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
206 starting 4 threads for background file closing (?) |
203 starting 4 threads for background file closing (?) |
207 preserving b for resolve of b |
204 preserving b for resolve of b |
208 preserving rev for resolve of rev |
205 preserving rev for resolve of rev |
209 b: local copied/moved from a -> m (premerge) |
206 b: local copied/moved from a -> m |
210 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
207 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
211 merging b and a to b |
208 merging b and a to b |
212 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
209 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
213 premerge successful |
210 premerge successful |
214 rev: versions differ -> m (premerge) |
211 rev: versions differ -> m |
215 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
212 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
216 merging rev |
213 merging rev |
217 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
214 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
218 rev: versions differ -> m (merge) |
|
219 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
215 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
220 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
216 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
221 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
217 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
222 merge tool returned: 0 |
218 merge tool returned: 0 |
223 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
219 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
242 branchmerge: True, force: False, partial: False |
238 branchmerge: True, force: False, partial: False |
243 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
239 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
244 b: remote created -> g |
240 b: remote created -> g |
245 getting b |
241 getting b |
246 preserving rev for resolve of rev |
242 preserving rev for resolve of rev |
247 rev: versions differ -> m (premerge) |
243 rev: versions differ -> m |
248 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
244 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
249 merging rev |
245 merging rev |
250 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
246 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
251 rev: versions differ -> m (merge) |
|
252 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
247 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
253 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
248 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
254 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
249 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
255 merge tool returned: 0 |
250 merge tool returned: 0 |
256 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
251 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
274 resolving manifests |
269 resolving manifests |
275 branchmerge: True, force: False, partial: False |
270 branchmerge: True, force: False, partial: False |
276 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
271 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
277 starting 4 threads for background file closing (?) |
272 starting 4 threads for background file closing (?) |
278 preserving rev for resolve of rev |
273 preserving rev for resolve of rev |
279 rev: versions differ -> m (premerge) |
274 rev: versions differ -> m |
280 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
275 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
281 merging rev |
276 merging rev |
282 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
277 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
283 rev: versions differ -> m (merge) |
|
284 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
278 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
285 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
279 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
286 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
280 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
287 merge tool returned: 0 |
281 merge tool returned: 0 |
288 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
282 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
309 a: other deleted -> r |
303 a: other deleted -> r |
310 removing a |
304 removing a |
311 b: remote created -> g |
305 b: remote created -> g |
312 getting b |
306 getting b |
313 preserving rev for resolve of rev |
307 preserving rev for resolve of rev |
314 rev: versions differ -> m (premerge) |
308 rev: versions differ -> m |
315 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
309 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
316 merging rev |
310 merging rev |
317 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
311 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
318 rev: versions differ -> m (merge) |
|
319 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
312 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
320 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
313 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
321 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
314 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
322 merge tool returned: 0 |
315 merge tool returned: 0 |
323 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
316 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
340 resolving manifests |
333 resolving manifests |
341 branchmerge: True, force: False, partial: False |
334 branchmerge: True, force: False, partial: False |
342 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
335 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
343 starting 4 threads for background file closing (?) |
336 starting 4 threads for background file closing (?) |
344 preserving rev for resolve of rev |
337 preserving rev for resolve of rev |
345 rev: versions differ -> m (premerge) |
338 rev: versions differ -> m |
346 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
339 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
347 merging rev |
340 merging rev |
348 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
341 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
349 rev: versions differ -> m (merge) |
|
350 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
342 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
351 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
343 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
352 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
344 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
353 merge tool returned: 0 |
345 merge tool returned: 0 |
354 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
346 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
372 branchmerge: True, force: False, partial: False |
364 branchmerge: True, force: False, partial: False |
373 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
365 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
374 starting 4 threads for background file closing (?) |
366 starting 4 threads for background file closing (?) |
375 preserving b for resolve of b |
367 preserving b for resolve of b |
376 preserving rev for resolve of rev |
368 preserving rev for resolve of rev |
377 b: both renamed from a -> m (premerge) |
369 b: both renamed from a -> m |
378 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
370 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
379 merging b |
371 merging b |
380 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
372 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
381 rev: versions differ -> m (premerge) |
|
382 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
383 merging rev |
|
384 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
385 b: both renamed from a -> m (merge) |
|
386 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
373 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
387 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
374 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
388 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
375 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
389 merge tool returned: 0 |
376 merge tool returned: 0 |
390 rev: versions differ -> m (merge) |
377 rev: versions differ -> m |
|
378 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
379 merging rev |
|
380 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
391 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
381 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
392 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
382 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
393 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
383 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
394 merge tool returned: 0 |
384 merge tool returned: 0 |
395 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
385 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
423 b |
413 b |
424 c |
414 c |
425 c: remote created -> g |
415 c: remote created -> g |
426 getting c |
416 getting c |
427 preserving rev for resolve of rev |
417 preserving rev for resolve of rev |
428 rev: versions differ -> m (premerge) |
418 rev: versions differ -> m |
429 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
419 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
430 merging rev |
420 merging rev |
431 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
421 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
432 rev: versions differ -> m (merge) |
|
433 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
422 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
434 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
423 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
435 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
424 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
436 merge tool returned: 0 |
425 merge tool returned: 0 |
437 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
426 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
454 branchmerge: True, force: False, partial: False |
443 branchmerge: True, force: False, partial: False |
455 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
444 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
456 starting 4 threads for background file closing (?) |
445 starting 4 threads for background file closing (?) |
457 preserving b for resolve of b |
446 preserving b for resolve of b |
458 preserving rev for resolve of rev |
447 preserving rev for resolve of rev |
459 b: both created -> m (premerge) |
448 b: both created -> m |
460 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
449 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
461 merging b |
450 merging b |
462 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
451 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
463 rev: versions differ -> m (premerge) |
|
464 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
465 merging rev |
|
466 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
|
467 b: both created -> m (merge) |
|
468 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
452 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
469 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
453 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
470 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
454 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
471 merge tool returned: 0 |
455 merge tool returned: 0 |
472 rev: versions differ -> m (merge) |
456 rev: versions differ -> m |
|
457 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
458 merging rev |
|
459 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
473 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
460 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
474 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
461 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
475 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
462 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
476 merge tool returned: 0 |
463 merge tool returned: 0 |
477 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
464 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
496 a: other deleted -> r |
483 a: other deleted -> r |
497 removing a |
484 removing a |
498 starting 4 threads for background file closing (?) |
485 starting 4 threads for background file closing (?) |
499 preserving b for resolve of b |
486 preserving b for resolve of b |
500 preserving rev for resolve of rev |
487 preserving rev for resolve of rev |
501 b: both created -> m (premerge) |
488 b: both created -> m |
502 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
489 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
503 merging b |
490 merging b |
504 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
491 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
505 rev: versions differ -> m (premerge) |
|
506 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
507 merging rev |
|
508 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
509 b: both created -> m (merge) |
|
510 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
492 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
511 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
493 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
512 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
494 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
513 merge tool returned: 0 |
495 merge tool returned: 0 |
514 rev: versions differ -> m (merge) |
496 rev: versions differ -> m |
|
497 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
498 merging rev |
|
499 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
515 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
500 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
516 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
501 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
517 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
502 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
518 merge tool returned: 0 |
503 merge tool returned: 0 |
519 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
504 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
536 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
521 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
537 a: remote is newer -> g |
522 a: remote is newer -> g |
538 getting a |
523 getting a |
539 preserving b for resolve of b |
524 preserving b for resolve of b |
540 preserving rev for resolve of rev |
525 preserving rev for resolve of rev |
541 b: both renamed from a -> m (premerge) |
526 b: both renamed from a -> m |
542 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
527 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
543 merging b |
528 merging b |
544 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 |
529 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 |
545 premerge successful |
530 premerge successful |
546 rev: versions differ -> m (premerge) |
531 rev: versions differ -> m |
547 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
532 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
548 merging rev |
533 merging rev |
549 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
534 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
550 rev: versions differ -> m (merge) |
|
551 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
535 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
552 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
536 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
553 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
537 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
554 merge tool returned: 0 |
538 merge tool returned: 0 |
555 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
539 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
574 a: other deleted -> r |
558 a: other deleted -> r |
575 removing a |
559 removing a |
576 starting 4 threads for background file closing (?) |
560 starting 4 threads for background file closing (?) |
577 preserving b for resolve of b |
561 preserving b for resolve of b |
578 preserving rev for resolve of rev |
562 preserving rev for resolve of rev |
579 b: both created -> m (premerge) |
563 b: both created -> m |
580 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
564 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
581 merging b |
565 merging b |
582 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
566 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
583 rev: versions differ -> m (premerge) |
|
584 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
585 merging rev |
|
586 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
587 b: both created -> m (merge) |
|
588 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
567 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
589 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
568 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
590 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
569 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
591 merge tool returned: 0 |
570 merge tool returned: 0 |
592 rev: versions differ -> m (merge) |
571 rev: versions differ -> m |
|
572 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
573 merging rev |
|
574 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
593 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
575 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
594 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
576 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
595 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
577 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
596 merge tool returned: 0 |
578 merge tool returned: 0 |
597 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
579 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
614 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
596 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
615 a: remote is newer -> g |
597 a: remote is newer -> g |
616 getting a |
598 getting a |
617 preserving b for resolve of b |
599 preserving b for resolve of b |
618 preserving rev for resolve of rev |
600 preserving rev for resolve of rev |
619 b: both renamed from a -> m (premerge) |
601 b: both renamed from a -> m |
620 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
602 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
621 merging b |
603 merging b |
622 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 |
604 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 |
623 premerge successful |
605 premerge successful |
624 rev: versions differ -> m (premerge) |
606 rev: versions differ -> m |
625 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
607 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
626 merging rev |
608 merging rev |
627 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
609 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
628 rev: versions differ -> m (merge) |
|
629 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
610 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
630 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
611 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
631 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
612 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
632 merge tool returned: 0 |
613 merge tool returned: 0 |
633 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
614 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
650 branchmerge: True, force: False, partial: False |
631 branchmerge: True, force: False, partial: False |
651 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
632 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
652 starting 4 threads for background file closing (?) |
633 starting 4 threads for background file closing (?) |
653 preserving b for resolve of b |
634 preserving b for resolve of b |
654 preserving rev for resolve of rev |
635 preserving rev for resolve of rev |
655 b: both renamed from a -> m (premerge) |
636 b: both renamed from a -> m |
656 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
637 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
657 merging b |
638 merging b |
658 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 |
639 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 |
659 premerge successful |
640 premerge successful |
660 rev: versions differ -> m (premerge) |
641 rev: versions differ -> m |
661 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
642 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
662 merging rev |
643 merging rev |
663 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
644 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
664 rev: versions differ -> m (merge) |
|
665 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
645 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
666 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
646 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
667 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
647 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
668 merge tool returned: 0 |
648 merge tool returned: 0 |
669 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
649 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
686 branchmerge: True, force: False, partial: False |
666 branchmerge: True, force: False, partial: False |
687 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
667 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
688 starting 4 threads for background file closing (?) |
668 starting 4 threads for background file closing (?) |
689 preserving b for resolve of b |
669 preserving b for resolve of b |
690 preserving rev for resolve of rev |
670 preserving rev for resolve of rev |
691 b: both renamed from a -> m (premerge) |
671 b: both renamed from a -> m |
692 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
672 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
693 merging b |
673 merging b |
694 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337 |
674 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337 |
695 premerge successful |
675 premerge successful |
696 rev: versions differ -> m (premerge) |
676 rev: versions differ -> m |
697 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
677 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
698 merging rev |
678 merging rev |
699 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
679 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
700 rev: versions differ -> m (merge) |
|
701 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
680 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
702 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
681 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
703 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
682 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
704 merge tool returned: 0 |
683 merge tool returned: 0 |
705 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
684 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
721 branchmerge: True, force: False, partial: False |
700 branchmerge: True, force: False, partial: False |
722 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
701 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
723 starting 4 threads for background file closing (?) |
702 starting 4 threads for background file closing (?) |
724 preserving b for resolve of b |
703 preserving b for resolve of b |
725 preserving rev for resolve of rev |
704 preserving rev for resolve of rev |
726 b: both renamed from a -> m (premerge) |
705 b: both renamed from a -> m |
727 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
706 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
728 merging b |
707 merging b |
729 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337 |
708 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337 |
730 premerge successful |
709 premerge successful |
731 rev: versions differ -> m (premerge) |
710 rev: versions differ -> m |
732 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
711 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
733 merging rev |
712 merging rev |
734 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
713 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
735 rev: versions differ -> m (merge) |
|
736 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
714 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
737 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
715 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
738 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
716 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
739 merge tool returned: 0 |
717 merge tool returned: 0 |
740 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
718 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
760 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
738 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
761 starting 4 threads for background file closing (?) |
739 starting 4 threads for background file closing (?) |
762 preserving a for resolve of b |
740 preserving a for resolve of b |
763 preserving rev for resolve of rev |
741 preserving rev for resolve of rev |
764 removing a |
742 removing a |
765 b: remote moved from a -> m (premerge) |
743 b: remote moved from a -> m |
766 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
744 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
767 merging a and b to b |
745 merging a and b to b |
768 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
746 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
769 rev: versions differ -> m (premerge) |
|
770 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
771 merging rev |
|
772 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
773 b: remote moved from a -> m (merge) |
|
774 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
747 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
775 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
748 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
776 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
749 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
777 merge tool returned: 0 |
750 merge tool returned: 0 |
778 rev: versions differ -> m (merge) |
751 rev: versions differ -> m |
779 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
752 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
753 merging rev |
780 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
754 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
755 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
756 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
781 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
757 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
782 merge tool returned: 0 |
758 merge tool returned: 0 |
783 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
759 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
784 (branch merge, don't forget to commit) |
760 (branch merge, don't forget to commit) |
785 -------------- |
761 -------------- |
802 branchmerge: True, force: False, partial: False |
778 branchmerge: True, force: False, partial: False |
803 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
779 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
804 starting 4 threads for background file closing (?) |
780 starting 4 threads for background file closing (?) |
805 preserving b for resolve of b |
781 preserving b for resolve of b |
806 preserving rev for resolve of rev |
782 preserving rev for resolve of rev |
807 b: local copied/moved from a -> m (premerge) |
783 b: local copied/moved from a -> m |
808 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
784 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
809 merging b and a to b |
785 merging b and a to b |
810 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
786 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
811 rev: versions differ -> m (premerge) |
|
812 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
813 merging rev |
|
814 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
815 b: local copied/moved from a -> m (merge) |
|
816 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
787 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
817 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
788 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
818 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
789 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) |
819 merge tool returned: 0 |
790 merge tool returned: 0 |
820 rev: versions differ -> m (merge) |
791 rev: versions differ -> m |
|
792 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
793 merging rev |
|
794 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
821 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
795 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
822 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
796 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
823 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
797 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
824 merge tool returned: 0 |
798 merge tool returned: 0 |
825 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
799 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
850 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
824 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
851 c: remote created -> g |
825 c: remote created -> g |
852 getting c |
826 getting c |
853 preserving b for resolve of b |
827 preserving b for resolve of b |
854 preserving rev for resolve of rev |
828 preserving rev for resolve of rev |
855 b: local copied/moved from a -> m (premerge) |
829 b: local copied/moved from a -> m |
856 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
830 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
857 merging b and a to b |
831 merging b and a to b |
858 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
832 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
859 premerge successful |
833 premerge successful |
860 rev: versions differ -> m (premerge) |
834 rev: versions differ -> m |
861 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
835 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
862 merging rev |
836 merging rev |
863 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
837 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
864 rev: versions differ -> m (merge) |
|
865 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
838 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
866 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
839 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
867 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
840 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) |
868 merge tool returned: 0 |
841 merge tool returned: 0 |
869 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
842 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |