Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2006-06-21 | rebase: error out for NO_PYTHON if they use recursive merge | Eric Wong | 1 | -0/+6 | |
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 | Add renaming-rebase test. | Junio C Hamano | 1 | -0/+106 | |
Signed-off-by: Junio C Hamano <junkio@cox.net> |