equal
deleted
inserted
replaced
96 evolving 4:3655f0f50885 "newer a" |
96 evolving 4:3655f0f50885 "newer a" |
97 abort: unresolved merge conflicts (see 'hg help resolve') |
97 abort: unresolved merge conflicts (see 'hg help resolve') |
98 [255] |
98 [255] |
99 $ hg resolve -m a |
99 $ hg resolve -m a |
100 (no more unresolved files) |
100 (no more unresolved files) |
|
101 continue: hg evolve --continue |
101 $ hg evolve --continue |
102 $ hg evolve --continue |
102 evolving 4:3655f0f50885 "newer a" |
103 evolving 4:3655f0f50885 "newer a" |
103 |
104 |
104 Stabilize latecomer with different parent |
105 Stabilize latecomer with different parent |
105 ========================================= |
106 ========================================= |