equal
deleted
inserted
replaced
313 what do you want to do? m |
313 what do you want to do? m |
314 merging subrepository "t" |
314 merging subrepository "t" |
315 resolving manifests |
315 resolving manifests |
316 branchmerge: True, force: False, partial: False |
316 branchmerge: True, force: False, partial: False |
317 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
317 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
|
318 preserving t for resolve of t |
318 starting 4 threads for background file closing (?) |
319 starting 4 threads for background file closing (?) |
319 preserving t for resolve of t |
|
320 t: versions differ -> m (premerge) |
320 t: versions differ -> m (premerge) |
321 picked tool ':merge' for t (binary False symlink False changedelete False) |
321 picked tool ':merge' for t (binary False symlink False changedelete False) |
322 merging t |
322 merging t |
323 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
323 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
324 t: versions differ -> m (merge) |
324 t: versions differ -> m (merge) |