From: Junio C Hamano <junkio@cox.net>
Date: Wed, 15 Mar 2006 23:40:41 GMT
Subject: Re: [PATCH] Let merge set the default strategy.
Message-ID: <7vhd5zff9i.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <1142463103-6986-markhollomon@comcast.net>

Mark Hollomon <markhollomon@comcast.net> writes:

> If the user does not set a merge strategy for git-pull,
> let git-merge calculate a default strategy.

Makes lot of sense, thanks.

> This may be preferable to the earlier patch involving
> NO_PYTHON.

Which earlier patch???