equal
deleted
inserted
replaced
68 resolving manifests |
68 resolving manifests |
69 branchmerge: False, force: False, partial: False |
69 branchmerge: False, force: False, partial: False |
70 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
70 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
71 b: other deleted -> r |
71 b: other deleted -> r |
72 removing b |
72 removing b |
|
73 starting 4 threads for background file closing (?) |
73 preserving a for resolve of a |
74 preserving a for resolve of a |
74 starting 4 threads for background file closing (?) |
|
75 a: versions differ -> m (premerge) |
75 a: versions differ -> m (premerge) |
76 picked tool 'true' for a (binary False symlink False changedelete False) |
76 picked tool 'true' for a (binary False symlink False changedelete False) |
77 merging a |
77 merging a |
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
79 a: versions differ -> m (merge) |
79 a: versions differ -> m (merge) |