git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 12, 2016, 18:15 UTC
Message-ID
<xmqqa8n5vlqs.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20160211211509.GA14667@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 29 quoted lines
> 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>
Thanks all.  Will merge to 'next' and then to 'master' shortly.
Previous: David Aguilar
Message 12 of 12 in “mergetool: reorder vim/gvim buffers in three-way diffs”
  1. mergetool: reorder vim/gvim buffers in three-way diffsDickson Wong, Jan 29, 2016
  2. Junio C HamanoJan 29, 2016
  3. Junio C HamanoFeb 9, 2016
  4. Michael J GruberFeb 10, 2016
  5. Junio C HamanoFeb 10, 2016
  6. Michael J GruberFeb 11, 2016
  7. Junio C HamanoFeb 11, 2016
  8. Dickson WongFeb 11, 2016
  9. Junio C HamanoFeb 11, 2016
  10. Dickson WongFeb 11, 2016
  11. David AguilarFeb 11, 2016
  12. Junio C HamanoFeb 12, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.