From: Junio C Hamano <junkio@cox.net>
Date: Fri, 02 Dec 2005 05:09:43 GMT
Subject: Re: resolve (merge) problems
Message-ID: <7vk6eo9jag.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051202020512.99856.qmail@web31811.mail.mud.yahoo.com>

Luben Tuikov <ltuikov@yahoo.com> writes:

> $python -V
> Python 2.4.2
> $which python
> /usr/local/bin/python

Since you do not want to use /usr/bin/python but from your own
location /usr/local/bin/python, I presume you built git with

	$ make PYTHON_PATH=/usr/local/bin/python

among other installation specific override needed on your
machine?