diff options
| author | Dickson Wong <dicksonwong@gmail.com> | 2016-01-28 18:18:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-12 10:14:09 -0800 |
| commit | 2300328cb209762a14e32525cfaa91778681f059 (patch) | |
| tree | 999c07c9ebdee550a950f82493f7b086974e4278 /mergetools | |
| parent | 754884255bb580df159e58defa81cdd30b5c430c (diff) | |
| download | git-2300328cb209762a14e32525cfaa91778681f059.tar.gz git-2300328cb209762a14e32525cfaa91778681f059.tar.xz | |
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: Dickson Wong <dicksonwong@gmail.com>
Tested-by: Michael J Gruber <git@drmicha.warpmail.net>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/vimdiff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 1ddfbfcd7..74ea6d547 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -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" |