summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
AgeCommit message (Collapse)AuthorFilesLines
2006-10-27tests: merge-recursive is usable without PythonLibravatar Junio C Hamano1-6/+0
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>
2006-06-21rebase: error out for NO_PYTHON if they use recursive mergeLibravatar Eric Wong1-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-21Add renaming-rebase test.Libravatar Junio C Hamano1-0/+106
Signed-off-by: Junio C Hamano <junkio@cox.net>