From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org, Dickson Wong <dicksonwong@gmail.com>
Subject: Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs
Date: Thu, 11 Feb 2016 13:15:09 -0800 [thread overview]
Message-ID: <20160211211509.GA14667@gmail.com> (raw)
In-Reply-To: <xmqqbn7nxmhe.fsf@gitster.mtv.corp.google.com>
On Thu, Feb 11, 2016 at 08:03:57AM -0800, Junio C Hamano wrote:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
>
> >> Does this mean that I should warn in the release notes that some
> >> existing users might get their expectation broken but we are going
> >> ahead anyway because we think most people read left to right and
> >> then top down? I am OK with saying that--I just wanted to make sure
> >> we know that it is what we are doing.
> >
> > I would claim that anyone who notices the difference in buffer numbering
> > would be positively surprised.
>
> Thanks. I, being a non-user of vim, was wondering if people who had
> their own user-defined commands (macros? and possibly short-cut keys
> to invoke them) built around the old (and odd) numbering need to
> adjust--in which case we may need to forewarn.
>
> > In any case, the buffer numbering is not the same (it is local remote
> > base merge) but it doesn't matter in this case because only one window
> > is displayed, so there is no visual association.
>
> OK, thanks.
Sorry for not noticing this thread earlier.
The change and the rationale sound good to me.
FWIW,
Acked-by: David Aguilar <davvid@gmail.com>
ciao,
--
David
next prev parent reply other threads:[~2016-02-11 21:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-29 2:18 [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs Dickson Wong
2016-01-29 18:45 ` Junio C Hamano
2016-02-09 22:25 ` Junio C Hamano
2016-02-10 14:40 ` Michael J Gruber
2016-02-10 17:45 ` Junio C Hamano
2016-02-11 15:44 ` Michael J Gruber
2016-02-11 16:03 ` Junio C Hamano
2016-02-11 19:24 ` Dickson Wong
2016-02-11 19:31 ` Junio C Hamano
2016-02-11 20:10 ` Dickson Wong
2016-02-11 21:15 ` David Aguilar [this message]
2016-02-12 18:15 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160211211509.GA14667@gmail.com \
--to=davvid@gmail.com \
--cc=dicksonwong@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).