equal
deleted
inserted
replaced
187 fix conflict then run 'hg evolve --continue' or use `hg evolve --abort` |
187 fix conflict then run 'hg evolve --continue' or use `hg evolve --abort` |
188 abort: unresolved merge conflicts (see hg help resolve) |
188 abort: unresolved merge conflicts (see hg help resolve) |
189 [255] |
189 [255] |
190 |
190 |
191 $ hg evolve --abort |
191 $ hg evolve --abort |
192 cannot clean up public changesets: c41c793e0ef1 |
192 evolve aborted |
193 abort: unable to abort interrupted evolve, use 'hg evolve --stop' to stop evolve |
193 working directory is now at 28cd06b3f801 |
194 [255] |
|
195 |
194 |
196 $ hg glog --hidden |
195 $ hg glog --hidden |
197 x 10:b7aedbe61ce6 added d |
196 x 10:b7aedbe61ce6 added d |
198 | () draft |
197 | () draft |
199 | * 9:28cd06b3f801 added c |
198 | @ 9:28cd06b3f801 added c |
200 | | () draft |
199 | | () draft |
201 | | x 8:9ff8adbe8a24 added c |
200 | | x 8:9ff8adbe8a24 added c |
202 | |/ () draft |
201 | |/ () draft |
203 | | x 7:e44ebefe4f54 added d |
202 | | x 7:e44ebefe4f54 added d |
204 | |/ () draft |
203 | |/ () draft |
208 | |/ () draft |
207 | |/ () draft |
209 +---o 4:c41c793e0ef1 added d |
208 +---o 4:c41c793e0ef1 added d |
210 | | () public |
209 | | () public |
211 o | 3:ca1b80f7960a added c |
210 o | 3:ca1b80f7960a added c |
212 | | () public |
211 | | () public |
213 @ | 2:b1661037fa25 added b |
212 o | 2:b1661037fa25 added b |
214 |/ () public |
213 |/ () public |
215 o 1:c7586e2a9264 added a |
214 o 1:c7586e2a9264 added a |
216 | () public |
215 | () public |
217 o 0:8fa14d15e168 added hgignore |
216 o 0:8fa14d15e168 added hgignore |
218 () public |
217 () public |