GNU bug report logs - #25493
26.0.50; ediff merge should (optionally) show ancestor in fourth window

Previous Next

Package: emacs;

Reported by: Philipp Stephani <p.stephani2 <at> gmail.com>

Date: Fri, 20 Jan 2017 11:19:01 UTC

Severity: wishlist

Found in version 26.0.50

Done: Tino Calancha <tino.calancha <at> gmail.com>

Bug is archived. No further changes may be made.

Full log

Message #17 received at 25493 <at> debbugs.gnu.org (full text, mbox):

From: npostavs <at> users.sourceforge.net
To: Tino Calancha <tino.calancha <at> gmail.com>
Cc: Philipp Stephani <p.stephani2 <at> gmail.com>,
 "Charles A. Roelli" <charles <at> aurox.ch>, 25493 <at> debbugs.gnu.org
Subject: Re: bug#25493: 26.0.50;
 ediff merge should (optionally) show ancestor in fourth window
Date: Mon, 27 Feb 2017 23:42:58 -0500

Tino Calancha <tino.calancha <at> gmail.com> writes:

> On Sun, 26 Feb 2017, Charles A. Roelli wrote:
>
>> Wow, well done.  Has this been committed yet?
> No yet.  I am waiting for aproval.
> People must be busy preparing the Emacs 25.2 release.

It's a big patch, I haven't had time to digest the whole thing yet, but
I'm wondering about why do we need both "\ show/hide ancestor" and "/
-show ancestor buff"?

         ~ -swap variants |     s -shrink window C    |  / -show ancestor buff
                          |  $$ -show clashes only    |  & -merge w/new default
                          |  $* -skip changed regions |
    +                     |  $% -all ancestor diffs   |
    +                     |  \\ -show/hide ancestor    |
This bug report was last modified 8 years and 69 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.