![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Eric Wong <normalperson@yhbt.net> | |
| Wed, 21 Jun 2006 10:04:42 +0000 (03:04 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 21 Jun 2006 10:56:30 +0000 (03:56 -0700) | ||
| commit | 693c15dc282c36042eac8d215beae3067db7565c | |
| tree | e61b9d272c16360ebca965a77d93feff4e2bfae7 | tree | snapshot |
| parent | c3fb0e358e594d081c7c0f37d557e29d2a5460b4 | commit | 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>
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>
| git-rebase.sh | diff | blob | history | |
| t/t3402-rebase-merge.sh | diff | blob | history |