git/mergetools/vimdiff, branch v2.7.2

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

2016-02-12T18:14:09Z

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 Tested-by: Michael J Gruber Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: add vimdiff3 mode

2014-04-22T19:49:07Z

It's similar to the default, except that the other windows are hidden. This ensures that removed/added colors are still visible on the main merge window, but the other windows not visible. Specially useful with merge.conflictstyle=diff3. Signed-off-by: Felipe Contreras Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: simplify how we handle "vim" and "defaults"

2013-01-29T03:00:38Z

Remove the exceptions for "vim" and "defaults" in the mergetool library so that every filename in mergetools/ matches 1:1 with the name of a valid built-in tool. Define the trivial fallback definition of shell functions in-line in git-mergetool-lib script, instead of dot-sourcing them from another file. The result is much easier to follow. [jc: squashed in an update from John Keeping as well] Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano