summaryrefslogtreecommitdiff
path: root/compat/vcbuild/include/utime.h
diff options
context:
space:
mode:
authorLibravatar Dickson Wong <dicksonwong@gmail.com>2016-01-28 18:18:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-12 10:14:09 -0800
commit2300328cb209762a14e32525cfaa91778681f059 (patch)
tree999c07c9ebdee550a950f82493f7b086974e4278 /compat/vcbuild/include/utime.h
parentGit 2.7 (diff)
downloadtgif-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 'compat/vcbuild/include/utime.h')
0 files changed, 0 insertions, 0 deletions