From: Marcin Zalewski <marcin.zalewski@gmail.com>
To: David Aguilar <davvid@gmail.com>
Cc: gitster@pobox.com, markus.heidelberg@web.de,
charles@hashpling.org, git@vger.kernel.org
Subject: Re: [PATCH] mergetool--lib: specialize diff options for emerge and ecmerge
Date: Sun, 3 May 2009 14:47:38 -0400 [thread overview]
Message-ID: <7c0fdf4f0905031147o47a7d2b1wbaa80df9058afeb6@mail.gmail.com> (raw)
In-Reply-To: <20090502194636.GA599@gmail.com>
David,
Thanks for your patches.
> If an emacs user could comment on the emerge snippet
> below (or perhaps suggest a better one ;)) then that
> would make me happy. As is, I have tested the
> emacs emerge snippet and it works, but I'm not
> sure if that's enough to resolve the issue reported
> by Marcin. Marcin?
>
> Here's the original thread:
> http://article.gmane.org/gmane.comp.version-control.git/117930
As far as I am concerned, this patch works well. Without the third
argument, ediff will not complain anymore that it is "too dangerous to
merge versions of a file visited by another buffer," which was my
original problem.
-Marcin
prev parent reply other threads:[~2009-05-03 18:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-02 8:57 [PATCH] mergetool--lib: specialize diff options for emerge and ecmerge David Aguilar
2009-05-02 19:46 ` David Aguilar
2009-05-03 6:27 ` Markus Heidelberg
2009-05-03 18:21 ` David Aguilar
2009-05-03 19:12 ` Markus Heidelberg
2009-05-03 20:34 ` David Aguilar
2009-05-03 18:47 ` Marcin Zalewski [this message]
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=7c0fdf4f0905031147o47a7d2b1wbaa80df9058afeb6@mail.gmail.com \
--to=marcin.zalewski@gmail.com \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=markus.heidelberg@web.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).