Junio C Hamano venit, vidit, dixit 09.02.2016 23:25:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
>> Dickson Wong <dicksonwong@xxxxxxxxx> writes:
>>
>>> When invoking default (g)vimdiff three-way merge, the merged file is
>>> loaded as the first buffer but moved to the bottom as the fourth window.
>>> This causes a disconnect between vim commands that operate on window
>>> positions (e.g. CTRL-W_w) and those that operate on buffer index (e.g.
>>> do/dp).
>>>
>>> This change reorders the buffers to have the same index as windows while
>>> keeping the cursor default to the merged result as the bottom window.
>>>
>>> Signed-off-by: Dickson Wong <dicksonwong@xxxxxxxxx>
>>> ---
>>
>> David, I unfortunately do not use 'mergetools' myself and certainly
>> not vimdiff.
>>
>> Opinions?
>
> Second call for help. Any comments on this from anybody other than
> the author that I missed to support this change?
>
OK, applied it (on top of next), looks sane and improves the situation
for the majority of people who read left to right, then top down and
assign buffers 1 2 3 4 "mentally" to local base remote merge windows
based on that. Their expectation is met now. Thanks!
(Also, the other vim variants don't need a corresponding change.)
Michael
>>
>>> mergetools/vimdiff | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/mergetools/vimdiff b/mergetools/vimdiff
>>> index 1ddfbfc..74ea6d5 100644
>>> --- a/mergetools/vimdiff
>>> +++ b/mergetools/vimdiff
>>> @@ -2,22 +2,22 @@ diff_cmd () {
>>> "$merge_tool_path" -R -f -d \
>>> -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
>>> }
>>>
>>> merge_cmd () {
>>> touch "$BACKUP"
>>> case "$1" in
>>> gvimdiff|vimdiff)
>>> if $base_present
>>> then
>>> - "$merge_tool_path" -f -d -c 'wincmd J' \
>>> - "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
>>> + "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
>>> + "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
>>> else
>>> "$merge_tool_path" -f -d -c 'wincmd l' \
>>> "$LOCAL" "$MERGED" "$REMOTE"
>>> fi
>>> ;;
>>> gvimdiff2|vimdiff2)
>>> "$merge_tool_path" -f -d -c 'wincmd l' \
>>> "$LOCAL" "$MERGED" "$REMOTE"
>>> ;;
>>> gvimdiff3|vimdiff3)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html