Dickson Wong 2300328cb2 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>		2016-02-12 10:14:09 -08:00
..
araxis
bc	mergetool: rename bc3 to bc	2014-10-21 11:25:30 -07:00
bc3	mergetool: rename bc3 to bc	2014-10-21 11:25:30 -07:00
codecompare
deltawalker
diffmerge	mergetools: stop setting $status in merge_cmd()	2014-11-21 11:27:53 -08:00
diffuse
ecmerge
emerge	mergetools: stop setting $status in merge_cmd()	2014-11-21 11:27:53 -08:00
gvimdiff
gvimdiff2
gvimdiff3
kdiff3	mergetools: stop setting $status in merge_cmd()	2014-11-21 11:27:53 -08:00
kompare
meld
opendiff
p4merge
tkdiff
tortoisemerge
vimdiff	mergetool: reorder vim/gvim buffers in three-way diffs	2016-02-12 10:14:09 -08:00
vimdiff2
vimdiff3
winmerge	mergetools: add winmerge as a builtin tool	2015-05-20 13:13:44 -07:00
xxdiff