equal
deleted
inserted
replaced
154 |/ |
154 |/ |
155 o 0:b4952fcf48cf@default(draft) add base |
155 o 0:b4952fcf48cf@default(draft) add base |
156 |
156 |
157 |
157 |
158 $ hg evo --all --any --unstable |
158 $ hg evo --all --any --unstable |
159 abort: no support for evolving merge changesets with two obsolete parents yet |
159 warning: no support for evolving merge changesets with two obsolete parents yet |
160 (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one) |
160 (Redo the merge (6b4280e33286) and use `hg prune <old> --succ <new>` to obsolete the old one) |
161 [255] |
|
162 $ hg log -G |
161 $ hg log -G |
163 @ 5:2db39fda7e2f@default(draft) cprime |
162 @ 5:2db39fda7e2f@default(draft) cprime |
164 | |
163 | |
165 | o 4:47127ea62e5f@default(draft) aprime |
164 | o 4:47127ea62e5f@default(draft) aprime |
166 |/ |
165 |/ |