Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | tests: merge-recursive is usable without Python | Junio C Hamano | 2006-10-27 |
| | | | | | | | Many tests still protected themselves with $no_python; there is no need to do so anymore. Signed-off-by: Junio C Hamano <junkio@cox.net> | ||
* | rebase: error out for NO_PYTHON if they use recursive merge | Eric Wong | 2006-06-21 |
| | | | | | | | | | | | | 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> | ||
* | Add renaming-rebase test. | Junio C Hamano | 2006-06-21 |
Signed-off-by: Junio C Hamano <junkio@cox.net> |