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