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

Re: emacs as mergetool

From
VLVijay Lakshminarayanan <laksvij@gmail.com>
Date
Sep 28, 2011, 04:03 UTC
Message-ID
<87d3elfh4c.fsf@gmail.com>
In-Reply-To
<201109261821.28382.thomas@koch.ro>
Thomas Koch <thomas@koch.ro> writes:
Show 14 quoted lines
> Hi,
>
> would you be so kind and give an emacs newbie (and vim refugee) a hint about 
> using emacs as mergetool?
>
> - Which one? ediff vs. emerge (I don't bother learning, just give me the best)
> - I'd like to have a setup, where I can run mergetool with different options 
> to
>   - connect to a running emacs server
>   - run emacs in X
>   - or in the terminal (default)
> - Is it possible to resolve all conflicting files in one session instead of 
> having emacs called again for every file?
> - Do you know a tutorial on emacs as a mergetool?
http://www.emacswiki.org/emacs/EmergeDiff works for me.
> Thank you,
>
> Thomas Koch, http://www.koch.ro
-- 
Cheers
~vijay
Previous: Rémi VanicatNext: Nick
Message 3 of 4 in “emacs as mergetool”
  1. Thomas KochSep 26, 2011
  2. Rémi VanicatSep 26, 2011
  3. Vijay LakshminarayananSep 28, 2011
  4. NickSep 28, 2011

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.