2 Commits

Author	SHA1	Message	Date
Eric Wong	693c15dc28	rebase: error out for NO_PYTHON if they use recursive merge ... recursive merge relies on Python, and we can't perform rename-aware merges without the recursive merge. So bail out before trying it. The test won't work w/o recursive merge, either, so skip that, too. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-06-21 03:56:30 -07:00
Junio C Hamano	c3fb0e358e	Add renaming-rebase test. ... Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-06-21 03:56:29 -07:00