4 commits

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
Pavel Roskin	82e5a82fd7	Fix more typos, primarily in the code ... The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-07-10 00:36:44 -07:00
Johannes Schindelin	abb7c7b31c	Optionally work without python ... In some setups (notably server setups) you do not need that dependency. Gracefully handle the absence of python when NO_PYTHON is defined. Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-02-18 23:16:09 -08:00
Fredrik Kuivinen	7057463463	New test case: Criss-cross merge ... Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-03 12:29:07 -08:00