equal
deleted
inserted
replaced
170 s0^ Added foo (base) |
170 s0^ Added foo (base) |
171 |
171 |
172 $ hg evolve --content-divergent -r ec94a1ed1330 |
172 $ hg evolve --content-divergent -r ec94a1ed1330 |
173 merge:[s5] Added e and f |
173 merge:[s5] Added e and f |
174 with: [s4] Added e and f |
174 with: [s4] Added e and f |
175 base: [s] Added e and f |
175 base: [3] Added e and f |
176 updating to "local" side of the conflict: ec94a1ed1330 |
176 updating to "local" side of the conflict: ec94a1ed1330 |
177 merging "other" content-divergent changeset 'f2eff98490d2' |
177 merging "other" content-divergent changeset 'f2eff98490d2' |
178 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
178 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
179 working directory is now at 8faad6276dc6 |
179 working directory is now at 8faad6276dc6 |