From: npostavs@users.sourceforge.net
To: Tino Calancha <tino.calancha@gmail.com>
Cc: Philipp Stephani <p.stephani2@gmail.com>,
"Charles A. Roelli" <charles@aurox.ch>,
25493@debbugs.gnu.org
Subject: bug#25493: 26.0.50; ediff merge should (optionally) show ancestor in fourth window
Date: Mon, 27 Feb 2017 23:42:58 -0500 [thread overview]
Message-ID: <871sujdiy5.fsf@users.sourceforge.net> (raw)
In-Reply-To: <alpine.DEB.2.20.1702281245440.8630@calancha-pc> (Tino Calancha's message of "Tue, 28 Feb 2017 12:55:27 +0900 (JST)")
Tino Calancha <tino.calancha@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 |
next prev parent reply other threads:[~2017-02-28 4:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 11:17 bug#25493: 26.0.50; ediff merge should (optionally) show ancestor in fourth window Philipp Stephani
2017-02-19 10:47 ` Tino Calancha
2017-02-26 11:35 ` Charles A. Roelli
2017-02-28 3:55 ` Tino Calancha
2017-02-28 4:42 ` npostavs [this message]
2017-02-28 6:39 ` Tino Calancha
2017-03-04 23:06 ` npostavs
2017-03-06 14:06 ` Tino Calancha
2017-03-11 13:45 ` npostavs
2017-03-14 7:43 ` Tino Calancha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871sujdiy5.fsf@users.sourceforge.net \
--to=npostavs@users.sourceforge.net \
--cc=25493@debbugs.gnu.org \
--cc=charles@aurox.ch \
--cc=p.stephani2@gmail.com \
--cc=tino.calancha@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).