equal
deleted
inserted
replaced
63 checking for directory renames |
63 checking for directory renames |
64 resolving manifests |
64 resolving manifests |
65 branchmerge: True, force: False, partial: False |
65 branchmerge: True, force: False, partial: False |
66 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
66 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
67 preserving 1a for resolve of 1a |
67 preserving 1a for resolve of 1a |
|
68 starting 4 threads for background file closing (?) |
68 1a: local copied/moved from 1 -> m (premerge) |
69 1a: local copied/moved from 1 -> m (premerge) |
69 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
70 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
70 merging 1a and 1 to 1a |
71 merging 1a and 1 to 1a |
71 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9 |
72 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9 |
72 premerge successful |
73 premerge successful |
86 resolving manifests |
87 resolving manifests |
87 branchmerge: True, force: False, partial: False |
88 branchmerge: True, force: False, partial: False |
88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
89 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
89 preserving 1 for resolve of 1a |
90 preserving 1 for resolve of 1a |
90 removing 1 |
91 removing 1 |
|
92 starting 4 threads for background file closing (?) |
91 1a: remote moved from 1 -> m (premerge) |
93 1a: remote moved from 1 -> m (premerge) |
92 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
94 picked tool ':merge' for 1a (binary False symlink False changedelete False) |
93 merging 1 and 1a to 1a |
95 merging 1 and 1a to 1a |
94 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9 |
96 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9 |
95 premerge successful |
97 premerge successful |