From: Junio C Hamano Date: Mon, 02 Jul 2007 23:11:20 GMT Subject: Re: [PATCH] git-mergetool: add support for ediff Message-ID: <7vwsxiwgdj.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20070702144800.GA4720@thunk.org> Theodore Tso writes: > On Sun, Jul 01, 2007 at 09:49:10PM -0700, Junio C Hamano wrote: >> The reason I personally use emacsclient is not about the >> start-up delay, but with the access to existing buffers, >> keyboard macros, Gnus buffers, ... IOW the access to the >> "session" while editing. I suspect people with long running >> Emacs session use emacsclient for that reason. > > Sure, but do you need access to existing buffers, keyboard, macros, > etc., if you're simply firing up an emacs to handle a merge conflict? > > If the goal is just to run a merge application, then firing up a > separate process makes a lot more sense. Existing buffers may help somewhat as I am likely to have that already loaded, but other than that probably not. > In my mind it's on the hairy edge. Alternatively we just never use > ediff by default, and assume that either expert users can hack their > .emacs.el file to have the right overrides will use ediff, or who are > willing to put up with ediff's user-hostile approach to quitting an > merge session. I think that is sane.