@matheusbsbs / matheus-bagliano / commits / 160a59f326
Fork 0

Merge branch 'ew/rebase' into next

* ew/rebase: rebase: error out for NO_PYTHON if they use recursive merge Add renaming-rebase test. rebase: Allow merge strategies to be used when rebasing object-refs: avoid division by zero

Junio C Hamano committed Jun 21, 2006 at 03:56 UTC 160a59f326d55970f8a038ef635c662b9c648c75

No changes.