diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2006-06-21 03:04:42 -0700 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-06-21 03:56:30 -0700 |
| commit | 693c15dc282c36042eac8d215beae3067db7565c (patch) | |
| tree | e61b9d272c16360ebca965a77d93feff4e2bfae7 /builtin-check-ref-format.c | |
| parent | Add renaming-rebase test. (diff) | |
| download | tgif-693c15dc282c36042eac8d215beae3067db7565c.tar.xz | |
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 'builtin-check-ref-format.c')
0 files changed, 0 insertions, 0 deletions