equal
deleted
inserted
replaced
251 $ hg graft --stop --continue |
251 $ hg graft --stop --continue |
252 abort: cannot specify both --stop and --continue |
252 abort: cannot specify both --stop and --continue |
253 [255] |
253 [255] |
254 |
254 |
255 $ hg graft --stop -U |
255 $ hg graft --stop -U |
256 abort: cannot specify any other flag with '--stop' |
256 abort: cannot specify both --stop and --user |
257 [255] |
257 [255] |
258 $ hg graft --stop --rev 4 |
258 $ hg graft --stop --rev 4 |
259 abort: cannot specify any other flag with '--stop' |
259 abort: cannot specify both --stop and --rev |
260 [255] |
260 [255] |
261 $ hg graft --stop --log |
261 $ hg graft --stop --log |
262 abort: cannot specify any other flag with '--stop' |
262 abort: cannot specify both --stop and --log |
263 [255] |
263 [255] |
264 |
264 |
265 $ hg graft --stop |
265 $ hg graft --stop |
266 stopped the interrupted graft |
266 stopped the interrupted graft |
267 working directory is now at a0deacecd59d |
267 working directory is now at a0deacecd59d |
361 $ hg graft --abort --stop |
361 $ hg graft --abort --stop |
362 abort: cannot specify both --abort and --stop |
362 abort: cannot specify both --abort and --stop |
363 [255] |
363 [255] |
364 |
364 |
365 $ hg graft --abort --currentuser |
365 $ hg graft --abort --currentuser |
366 abort: cannot specify any other flag with '--abort' |
366 abort: cannot specify both --abort and --user |
367 [255] |
367 [255] |
368 |
368 |
369 $ hg graft --abort --edit |
369 $ hg graft --abort --edit |
370 abort: cannot specify any other flag with '--abort' |
370 abort: cannot specify both --abort and --edit |
371 [255] |
371 [255] |
372 |
372 |
373 #if abortcommand |
373 #if abortcommand |
374 when in dry-run mode |
374 when in dry-run mode |
375 $ hg abort --dry-run |
375 $ hg abort --dry-run |