2 commits

Author	SHA1	Message	Date
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