tests/test-rebase-scenario-global.t
changeset 31225 749b057b01f3
parent 31143 628600bf55e4
child 31302 681046de87f1
equal deleted inserted replaced
31224:183eb1d7f87d 31225:749b057b01f3
   270 
   270 
   271   $ hg rebase -s 6 -d 1
   271   $ hg rebase -s 6 -d 1
   272   rebasing 6:eea13746799a "G"
   272   rebasing 6:eea13746799a "G"
   273   abort: cannot use revision 6 as base, result would have 3 parents
   273   abort: cannot use revision 6 as base, result would have 3 parents
   274   [255]
   274   [255]
   275 
   275   $ hg rebase --abort
       
   276   rebase aborted
   276 
   277 
   277 These will abort gracefully (using --base):
   278 These will abort gracefully (using --base):
   278 
   279 
   279 G onto G - rebase onto same changeset:
   280 G onto G - rebase onto same changeset:
   280 
   281