| commit | 2300328cb209762a14e32525cfaa91778681f059 | |
| author | Dickson Wong <dicksonwong@gmail.com> | |
| Fri, 29 Jan 2016 02:18:14 +0000 (28 18:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Feb 2016 18:14:09 +0000 (12 10:14 -0800) | ||
| tree | 999c07c9ebdee550a950f82493f7b086974e4278 | treesnapshot (tar.gz zip) |
| parent | 754884255bb580df159e58defa81cdd30b5c430c | commitdiff |
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>
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>
| mergetools/vimdiff | diffblobblamehistory |