Merge branch 'ew/rebase'
* ew/rebase: rebase --merge: fix for rebasing more than 7 commits. rebase: error out for NO_PYTHON if they use recursive merge Add renaming-rebase test. rebase: Allow merge strategies to be used when rebasing
Junio C Hamano committed
Jun 22, 2006 at 10:34 UTC
c5c23745d8d6eb0504a16851b9b080ec3ded94f9
No changes.