![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Wed, 16 Nov 2005 02:33:44 +0000 (03:33 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 16 Nov 2005 06:10:59 +0000 (22:10 -0800) | ||
| commit | ad4f4daae80cb00000aca76e1528add6daf8f033 | |
| tree | 1a3192c27df352fb11cb1f430ad174ecd90a3734 | tree | snapshot |
| parent | a0fa2a10b401aa4c8b13d176a5e3e3b7c455208f | commit | diff |
Give python a chance to find "backported" modules
python 2.2.1 is perfectly capable of executing git-merge-recursive,
provided that it finds heapq and sets. All you have to do is to steal
heapq.py and sets.py from python 2.3 or newer, and drop them in your
GIT_PYTHON_PATH.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
python 2.2.1 is perfectly capable of executing git-merge-recursive,
provided that it finds heapq and sets. All you have to do is to steal
heapq.py and sets.py from python 2.3 or newer, and drop them in your
GIT_PYTHON_PATH.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-recursive.py | diff | blob | history |