equal
deleted
inserted
replaced
93 $ hg evolve --continue |
93 $ hg evolve --continue |
94 grafting revision 5 |
94 grafting revision 5 |
95 abort: unresolved merge conflicts (see hg help resolve) |
95 abort: unresolved merge conflicts (see hg help resolve) |
96 [255] |
96 [255] |
97 $ hg resolve -m a |
97 $ hg resolve -m a |
98 no more unresolved files |
98 (no more unresolved files) |
99 $ hg evolve --continue |
99 $ hg evolve --continue |
100 grafting revision 5 |
100 grafting revision 5 |
101 |
101 |
102 Stabilize latecomer with different parent |
102 Stabilize latecomer with different parent |
103 ========================================= |
103 ========================================= |