From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 18 Jun 2008 15:19:00 GMT
Subject: Re: Guided merge with override
Message-ID: <alpine.DEB.1.00.0806181618070.6439@racer>
In-Reply-To: <7vve076d6t.fsf@gitster.siamese.dyndns.org>

Hi,

On Tue, 17 Jun 2008, Junio C Hamano wrote:

> No, neither --theirs nor --ours option exists in your version of git. 
> But here is a patch to add it to git-merge-file.

Looks good, thanks!  Just to be safe, this should be accompanied by tet 
cases.  But I did not see anything wrong with the patch.

Ciao,
Dscho