Skip to content
Snippets Groups Projects
Commit 2300328c authored by Dickson Wong's avatar Dickson Wong Committed by Junio C Hamano
Browse files

mergetool: reorder vim/gvim buffers in three-way diffs


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: default avatarDickson Wong <dicksonwong@gmail.com>
Tested-by: default avatarMichael J Gruber <git@drmicha.warpmail.net>
Acked-by: default avatarDavid Aguilar <davvid@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 75488425
Branches
Tags
No related merge requests found
......@@ -9,8 +9,8 @@ merge_cmd () {
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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment