branch | stable |
changeset 27963 | 07a5de79ec30 |
parent 27626 | 157675d0f600 |
child 28100 | ab382192337a |
--- a/tests/test-rebase-parameters.t Mon Feb 01 22:14:06 2016 +0900 +++ b/tests/test-rebase-parameters.t Mon Feb 01 15:41:43 2016 +0000 @@ -412,6 +412,16 @@ $ cd .. +Rebasing both a single revision and a merge in one command + + $ hg clone -q -u . a aX + $ cd aX + $ hg rebase -r 3 -r 6 + rebasing 3:32af7686d403 "D" + rebasing 6:eea13746799a "G" + saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-backup.hg (glob) + $ cd .. + Test --tool parameter: $ hg init b