From: Rémi Vanicat <vanicat@debian.org>
Date: Mon, 26 Sep 2011 17:28:58 GMT
Subject: Re: emacs as mergetool
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