equal
deleted
inserted
replaced
236 $ echo foo > d |
236 $ echo foo > d |
237 $ hg ci -Aqm "added foo to d" |
237 $ hg ci -Aqm "added foo to d" |
238 |
238 |
239 $ hg graft --stop |
239 $ hg graft --stop |
240 abort: no interrupted graft found |
240 abort: no interrupted graft found |
241 [255] |
241 [20] |
242 |
242 |
243 $ hg graft -r 3 |
243 $ hg graft -r 3 |
244 grafting 3:9150fe93bec6 "added d" |
244 grafting 3:9150fe93bec6 "added d" |
245 merging d |
245 merging d |
246 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
246 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
340 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
341 |
341 |
342 $ hg abort |
342 $ hg abort |
343 abort: no interrupted graft to abort (abortflag !) |
343 abort: no interrupted graft to abort (abortflag !) |
344 abort: no operation in progress (abortcommand !) |
344 abort: no operation in progress (abortcommand !) |
345 [255] |
345 [20] |
346 |
346 |
347 when stripping is required |
347 when stripping is required |
348 $ hg graft -r 4 -r 5 |
348 $ hg graft -r 4 -r 5 |
349 grafting 4:863a25e1a9ea "added x" |
349 grafting 4:863a25e1a9ea "added x" |
350 grafting 5:36b793615f78 "added foo to c" (tip) |
350 grafting 5:36b793615f78 "added foo to c" (tip) |