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