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