From: Vijay Lakshminarayanan <laksvij@gmail.com>
Date: Wed, 28 Sep 2011 04:03:31 GMT
Subject: Re: emacs as mergetool
Message-ID: <87d3elfh4c.fsf@gmail.com>
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?
>
> - 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