From: Richard Copley <rcopley@gmail.com>
To: Noam Postavsky <npostavs@users.sourceforge.net>
Cc: Glenn Morris <rgm@gnu.org>, Kaushal Modi <kaushal.modi@gmail.com>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: Regarding smerge upper/lower; needs NEWS
Date: Fri, 7 Apr 2017 20:23:41 +0100 [thread overview]
Message-ID: <CAPM58oiHm6vPv5eyinRNe=tpqDeVP1=VQc2q53_5VUCkU+XKuw@mail.gmail.com> (raw)
In-Reply-To: <CAM-tV--1aA+Nf=kZK0ouoyPL-DHOPTjZYU5Ev9-tfjC9cDNf_g@mail.gmail.com>
On 7 April 2017 at 20:09, Noam Postavsky <npostavs@users.sourceforge.net> wrote:
> On Fri, Apr 7, 2017 at 2:06 PM, Richard Copley <rcopley@gmail.com> wrote:
>
>>>> http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=bdfee01a6567b9f08f82bc84d1196e6cb62587ca
>>
>> I've had plenty of time to think about this and I still don't get
>> it. Why are we calling the left window UPPER and the right window
>> LOWER? In the lower pane (the conflicted file for resolution)
>> they are called "variant A" and "variant B". Shouldn't we call
>> them that too, so that we know which one is which?
>>
>
> You seem to be talking about ediff or emerge, but this thread is about
> smerge which operates in a single buffer, no windows involved.
Thanks, I knew I must have been missing something. IMO making
smerge weird is a disadvantage of this change.
next prev parent reply other threads:[~2017-04-07 19:23 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 14:01 Regarding smerge upper/lower; needs NEWS Kaushal Modi
2017-03-24 19:46 ` Glenn Morris
2017-04-07 18:06 ` Richard Copley
2017-04-07 19:09 ` Noam Postavsky
2017-04-07 19:23 ` Richard Copley [this message]
2017-04-07 19:24 ` Richard Copley
2017-04-07 19:53 ` Richard Copley
2017-04-13 0:49 ` Noam Postavsky
2017-04-13 18:32 ` Stefan Monnier
2017-04-13 19:03 ` Noam Postavsky
[not found] ` <CY1PR03MB2251867FBF42034CF55007ADF0020@CY1PR03MB2251.namprd03.prod.outlook.com>
2017-04-13 19:34 ` Stephan Mueller
2018-03-15 14:37 ` Richard Copley
2018-03-15 15:04 ` Stefan Monnier
2018-03-15 15:30 ` Richard Copley
2018-03-15 15:43 ` Stefan Monnier
2018-03-15 16:09 ` Richard Copley
2018-03-15 15:30 ` Kaushal Modi
2018-03-15 15:37 ` Richard Copley
2018-03-15 15:39 ` Kaushal Modi
2018-03-15 16:45 ` Glenn Morris
2018-03-15 17:00 ` Eli Zaretskii
2018-03-15 17:06 ` Óscar Fuentes
2018-03-15 17:15 ` Eli Zaretskii
2018-03-15 18:15 ` Stefan Monnier
2018-03-15 18:45 ` Drew Adams
2018-03-15 19:05 ` Stefan Monnier
2018-03-15 19:44 ` Drew Adams
2018-03-15 17:14 ` Richard Copley
2018-03-15 18:54 ` Stefan Monnier
2018-03-15 20:10 ` Richard Copley
2018-03-16 2:20 ` Noam Postavsky
2018-03-16 12:23 ` Stefan Monnier
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='CAPM58oiHm6vPv5eyinRNe=tpqDeVP1=VQc2q53_5VUCkU+XKuw@mail.gmail.com' \
--to=rcopley@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=kaushal.modi@gmail.com \
--cc=npostavs@users.sourceforge.net \
--cc=rgm@gnu.org \
/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).