From: Jakub Narebski <jnareb@gmail.com>
To: "Alexander Gladysh" <agladysh@gmail.com>
Cc: "Jeff King" <peff@peff.net>, git@vger.kernel.org
Subject: Re: git mergetool vs stash apply
Date: Tue, 20 May 2008 04:52:07 -0700 (PDT) [thread overview]
Message-ID: <m3prrh42hl.fsf@localhost.localdomain> (raw)
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
next prev parent reply other threads:[~2008-05-20 11:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-20 8:02 git mergetool vs stash apply Alexander Gladysh
2008-05-20 9:02 ` Jeff King
2008-05-20 11:16 ` Alexander Gladysh
2008-05-20 11:52 ` Jakub Narebski [this message]
2008-05-20 12:32 ` Alexander Gladysh
2008-05-20 12:45 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3prrh42hl.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=agladysh@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.