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

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 11, 2016, 16:03 UTC
Message-ID: <xmqqbn7nxmhe.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <56BCAC69.8030909@drmicha.warpmail.net>

Michael J Gruber <git@drmicha.warpmail.net> writes:

Show 8 quoted lines

>> 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.