diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-21 14:04:42 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 14:56:30 +0400 |
| commit | 693c15dc282c36042eac8d215beae3067db7565c (patch) | |
| tree | e61b9d272c16360ebca965a77d93feff4e2bfae7 /contrib/git-svn/git-svn.perl | |
| parent | c3fb0e358e594d081c7c0f37d557e29d2a5460b4 (diff) | |
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>
Diffstat (limited to 'contrib/git-svn/git-svn.perl')
0 files changed, 0 insertions, 0 deletions