![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 21 Jun 2006 10:56:41 +0000 (03:56 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 21 Jun 2006 10:56:41 +0000 (03:56 -0700) |
* 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
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
Trivial merge