rebase: error out for NO_PYTHON if they use recursive merge
authorEric Wong <normalperson@yhbt.net>
Wed, 21 Jun 2006 10:04:42 +0000 (03:04 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 10:56:30 +0000 (03:56 -0700)
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>
No differences found