From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 28 Jul 2007 09:02:40 GMT
Subject: Re: What's in git.git (stable)
Message-ID: <7vk5sksxxr.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <85zm1g3nze.fsf@lola.goethe.zz>

David Kastrup <dak@gnu.org> writes:

> I'd like to see some changes for mergetool's Emacs support: in
> moderately current versions of Emacs and XEmacs, ediff is a much
> preferable tool to emerge.

Between ediff and emerge, I think Ted gave a well thought out
analysis on the list earlier, so you might want to consider the
issues he raised if/when you tackle this.

This is late in the game, however, so your change probably won't
be merged before I can tag 1.5.3 final, but I'd expect that a
better Emacs support will be widely welcomed.