git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] mergetool--lib: specialize diff options for emerge and ecmerge

From
Marcin Zalewski <marcin.zalewski@gmail.com>
Date
May 3, 2009, 18:47 UTC
Message-ID
<7c0fdf4f0905031147o47a7d2b1wbaa80df9058afeb6@mail.gmail.com>
In-Reply-To
<20090502194636.GA599@gmail.com>
David,
Thanks for your patches.
Show 9 quoted lines
> 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
Previous: David Aguilar
Message 7 of 7 in “mergetool--lib: specialize diff options for emerge and ecmerge”
  1. mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar, May 2, 2009
  2. David AguilarMay 2, 2009
  3. Markus HeidelbergMay 3, 2009
  4. David AguilarMay 3, 2009
  5. Markus HeidelbergMay 3, 2009
  6. David AguilarMay 3, 2009
  7. Marcin ZalewskiMay 3, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.