kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
6,955 Commits
6 Branches
974 Tags
205 MiB
Commit Graph

3 Commits (562cefbdbfaeb92f91c961c67960a93a7772220c)

Author SHA1 Message Date
Junio C Hamano 36889a5078 tests: merge-recursive is usable without Python 
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-10-27 14:29:55 -07:00
Eric Wong 693c15dc28 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>
 2006-06-21 03:56:30 -07:00
Junio C Hamano c3fb0e358e Add renaming-rebase test. 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-06-21 03:56:29 -07:00