Merge branch 'maint'

diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper
index 0b266e3603fc32d886cc9018af49cc161a065d8b..f013726d0f77a4d8fd9faa00ec38e117e41bcb27 100755 (executable)
--- a/contrib/difftool/git-difftool-helper
+++ b/contrib/difftool/git-difftool-helper
@@ -78,12 +78,16 @@ launch_merge_tool () {
                "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
                ;;
 
-       meld|vimdiff)
+       meld)
                "$merge_tool_path" "$LOCAL" "$REMOTE"
                ;;
 
+       vimdiff)
+               "$merge_tool_path" -c "wincmd l" "$LOCAL" "$REMOTE"
+               ;;
+
        gvimdiff)
-               "$merge_tool_path" -f "$LOCAL" "$REMOTE"
+               "$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$REMOTE"
                ;;
 
        xxdiff)