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

Re: emacs as mergetool

From
Rémi Vanicat <vanicat@debian.org>
Date
Sep 26, 2011, 17:28 UTC
Message-ID
<87ty7zjjqd.dlv@debian.org>
In-Reply-To
<201109261821.28382.thomas@koch.ro>
Thomas Koch <thomas@koch.ro> writes:
> Hi,
>
> would you be so kind and give an emacs newbie (and vim refugee) a hint about 
> using emacs as mergetool?

In fact, I use magit like that: after the merge, if there was a conflict, I launch magit (M-x magit) and go on the unmerged file, then I use "e" (magit-ediff) to merge them. ediff merge tool is self documented, and I never needed more than its documentation.

Of course for this you need to install magit, and you don't really use Emacs as mergetool...

-- 
Rémi Vanicat
Previous: Thomas KochNext: Vijay Lakshminarayanan
Message 2 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.