From: Charles Bailey <charles@hashpling.org>
Date: Tue, 24 Feb 2009 07:47:27 GMT
Subject: Re: how do I resolve this merge manually + mergetool bug
Message-ID: <20090224074727.GA23927@hashpling.org>
In-Reply-To: <81bfc67a0902232204y7a1e9a91x6cbf751319664734@mail.gmail.com>

On Tue, Feb 24, 2009 at 01:04:23AM -0500, Caleb Cushing wrote:
> regardless of mergetools problems I'd like to know how to fix this
> merge without mergetool.

I see you've now resolved this without mergetool, I'll look at adding
a test case to mergetool and see how easy it is to get it to handle
this case better.

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/