From: Jakub Narebski <jnareb@gmail.com>
Date: Tue, 20 May 2008 11:52:07 GMT
Subject: Re: git mergetool vs stash apply
Message-ID: <m3prrh42hl.fsf@localhost.localdomain>
In-Reply-To: <c6c947f60805200416s61b0cc1eqd6d6c804abd15b4@mail.gmail.com>

"Alexander Gladysh" <agladysh@gmail.com> writes:

> On Tue, May 20, 2008 at 1:02 PM, Jeff King <peff@peff.net> wrote:
>>
>> So there is perhaps something specific about your setup or your conflict
>> that is causing mergetool not to work as expected.
> 
> Most likely so.
> 
>> Can you give us a test case that fails?
> 
> No, unfortunately I can not. I was unable to produce a minimal test
> case, and I can not share the whole repo.

Can you use contents-scrambling tool by Jeff King from
  Message-ID: <20080510055332.GB11556@sigill.intra.peff.net>
  http://permalink.gmane.org/gmane.comp.version-control.git/81652

I hope it would be aded at least to contrib when it is tested more...

-- 
Jakub Narebski
Poland
ShadeHawk on #git