Re: [PATCH] git-mergetool: add support for ediff

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 2, 2007, 04:49 UTC
Message-ID: <7vr6nrz9yx.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070702030521.GA4798@thunk.org>

Theodore Tso <tytso@mit.edu> writes:

Show 6 quoted lines

> One thing that did cross my mind is that we could put code which
> patched ediff.el and emerge.el in /usr/share/git/lisp/... and then
> passed called emacs with something like this "emacs -l
> $sharedir/lisp/ediff-patches.el ...".  But this implies packaging
> emacs lisp files with git, and I'm not at ALL sure we want to go
> there. ...

I hope not.

> ...  Personally, I still like kdiff3 as my personal favorite
> mergetool, and given that emacs starts up pretty fast these days, I've
> given up on emacsclient, but I know there are certainly people who use
> them.

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.