Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Optionally work without python | Johannes Schindelin | 2006-02-18 |
| | | | | | | | | 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> | ||
* | New test case: Criss-cross merge | Fredrik Kuivinen | 2005-12-03 |
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> |