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

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 2, 2007, 02:32 UTC
Message-ID: <7v1wfr1qn8.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070702020401.GD28917@thunk.org>

Theodore Tso <tytso@mit.edu> writes:

Show 7 quoted lines

> Unfortunately, it's not enough.  Ediff doesn't have an "abort" command
> which returns a non-zero exit status, and when you use the "quit"
> command, it asks you a series of obnoxious questions:
>
> ...
> Alternatively, we could patch around the problem.  The following emacs
> lisp code fixes the ediff issues:

But that would be changing the behaviour globally, and not limited to the particular session invoked from git-mergetool, wouldn't it? If that is the case it would be a hard sell to Emacs users, especially the ones that keep their Emacs running forever and have emacsclient as their EDITOR, I would think.