Optionally work without python
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Sat, 18 Feb 2006 12:01:18 +0000 (13:01 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:16:09 +0000 (23:16 -0800)
commitabb7c7b31c0896bd838bbb6437b310db5a42227a
treeca184974f14d8cd61e1a7c25173edcae17c9e7cb
parent289c4b36e336af5266b86d924ef0aa828e8e4841
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>
Makefile
git-merge.sh
t/Makefile
t/t0000-basic.sh
t/t6021-merge-criss-cross.sh
t/t6022-merge-rename.sh
t/test-lib.sh