equal
deleted
inserted
replaced
85 atop:[5] added c |
85 atop:[5] added c |
86 merging d |
86 merging d |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
88 fix conflicts and see `hg help evolve.interrupted` |
88 fix conflicts and see `hg help evolve.interrupted` |
89 [1] |
89 [1] |
|
90 |
|
91 $ hg parents |
|
92 changeset: 5:e93a9161a274 |
|
93 tag: tip |
|
94 parent: 2:b1661037fa25 |
|
95 user: test |
|
96 date: Thu Jan 01 00:00:00 1970 +0000 |
|
97 summary: added c |
|
98 |
90 |
99 |
91 $ hg evolve --abort |
100 $ hg evolve --abort |
92 evolve aborted |
101 evolve aborted |
93 working directory is now at e93a9161a274 |
102 working directory is now at e93a9161a274 |
94 |
103 |