From: Caleb Cushing <xenoterracide@gmail.com>
Date: Tue, 24 Feb 2009 07:19:32 GMT
Subject: Re: how do I resolve this merge manually + mergetool bug
Message-ID: <81bfc67a0902232319t7525e3b3n74b667257024800b@mail.gmail.com>
In-Reply-To: <7vr61ol2yn.fsf@gitster.siamese.dyndns.org>

On Tue, Feb 24, 2009 at 2:16 AM, Junio C Hamano <gitster@pobox.com> wrote:
> "git update-index --force-remove profiles/package.mask" should work
> better.  I tend to trust plumbing a lot more than Porcelain for these
> corner cases.

works. awesome! thanks for the help, I've been banging my head against
how to do this (without pain++ ) for a couple of days.
-- 
Caleb Cushing

http://xenoterracide.blogspot.com