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