tests/test-rebase-parameters.t
changeset 45826 21733e8c924f
parent 45771 f90a5c211251
child 45827 8d72e29ad1e0
equal deleted inserted replaced
45825:8f07f5a9c3de 45826:21733e8c924f
   478   $ cd b3
   478   $ cd b3
   479 
   479 
   480   $ hg rebase -s 2 -d 1 --tool internal:fail
   480   $ hg rebase -s 2 -d 1 --tool internal:fail
   481   rebasing 2:e4e3f3546619 tip "c2b"
   481   rebasing 2:e4e3f3546619 tip "c2b"
   482   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   482   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   483   [1]
   483   [240]
   484 
   484 
   485   $ hg summary
   485   $ hg summary
   486   parent: 1:56daeba07f4b 
   486   parent: 1:56daeba07f4b 
   487    c2
   487    c2
   488   branch: default
   488   branch: default