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