From: Charles Bailey Date: Fri, 30 Jan 2009 16:18:50 GMT Subject: Re: [PATCH] Quick and dirty mergetool fix - take 2 Message-ID: <20090130161850.GB26321@hashpling.org> In-Reply-To: <1233332166-14300-1-git-send-email-charles@hashpling.org> On Fri, Jan 30, 2009 at 04:16:06PM +0000, Charles Bailey wrote: Sorry, I meant to add this comment to the last patch. I have a test so I'm more confident about this version. It's not signed off yet as I want to clean up the new test and make sure I've considered everything - well more things - but it should at least work now. -- Charles Bailey http://ccgi.hashpling.plus.com/blog/