equal
deleted
inserted
replaced
70 searching for copies back to rev 1 |
70 searching for copies back to rev 1 |
71 resolving manifests |
71 resolving manifests |
72 branchmerge: True, force: False, partial: False |
72 branchmerge: True, force: False, partial: False |
73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
74 preserving bar for resolve of bar |
74 preserving bar for resolve of bar |
|
75 starting 4 threads for background file closing (?) |
75 bar: versions differ -> m (premerge) |
76 bar: versions differ -> m (premerge) |
76 picked tool ':merge' for bar (binary False symlink False changedelete False) |
77 picked tool ':merge' for bar (binary False symlink False changedelete False) |
77 merging bar |
78 merging bar |
78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
79 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
79 premerge successful |
80 premerge successful |
156 searching for copies back to rev 1 |
157 searching for copies back to rev 1 |
157 resolving manifests |
158 resolving manifests |
158 branchmerge: True, force: False, partial: False |
159 branchmerge: True, force: False, partial: False |
159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
160 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
160 preserving bar for resolve of bar |
161 preserving bar for resolve of bar |
|
162 starting 4 threads for background file closing (?) |
161 bar: versions differ -> m (premerge) |
163 bar: versions differ -> m (premerge) |
162 picked tool ':merge' for bar (binary False symlink False changedelete False) |
164 picked tool ':merge' for bar (binary False symlink False changedelete False) |
163 merging bar |
165 merging bar |
164 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
166 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
165 premerge successful |
167 premerge successful |