equal
deleted
inserted
replaced
143 merge:[5] watbar to a |
143 merge:[5] watbar to a |
144 with: [9] watbar to a |
144 with: [9] watbar to a |
145 base: [1] added a |
145 base: [1] added a |
146 merging "other" content-divergent changeset '82b74d5dc678' |
146 merging "other" content-divergent changeset '82b74d5dc678' |
147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
148 6 new orphan changesets |
|
149 merge:[6] added b |
148 merge:[6] added b |
150 with: [10] added b |
149 with: [10] added b |
151 base: [2] added b |
150 base: [2] added b |
152 updating to "local" side of the conflict: d5f148423c16 |
151 updating to "local" side of the conflict: d5f148423c16 |
153 merging "other" content-divergent changeset '88516dccf68a' |
152 merging "other" content-divergent changeset '88516dccf68a' |
320 base: [1] added a |
319 base: [1] added a |
321 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 |
320 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 |
322 updating to "local" side of the conflict: c04ff147ef79 |
321 updating to "local" side of the conflict: c04ff147ef79 |
323 merging "other" content-divergent changeset '186bdc2cdfa2' |
322 merging "other" content-divergent changeset '186bdc2cdfa2' |
324 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
323 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
325 6 new orphan changesets |
|
326 merge:[11] added b |
324 merge:[11] added b |
327 with: [6] added b |
325 with: [6] added b |
328 base: [2] added b |
326 base: [2] added b |
329 rebasing "other" content-divergent changeset d5f148423c16 on c04ff147ef79 |
327 rebasing "other" content-divergent changeset d5f148423c16 on c04ff147ef79 |
330 updating to "local" side of the conflict: 6eb54b5af3fb |
328 updating to "local" side of the conflict: 6eb54b5af3fb |