Options are taken from <Git source>/mergetools/vim

Signed-off-by: Alexey Shumkin <alex.crez...@gmail.com>
---
 git-gui/lib/mergetool.tcl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index 3c8e73b..4fc1cab 100644
--- a/git-gui/lib/mergetool.tcl
+++ b/git-gui/lib/mergetool.tcl
@@ -211,7 +211,13 @@ proc merge_resolve_tool2 {} {
                }
        }
        gvimdiff {
-               set cmdline [list "$merge_tool_path" -f "$LOCAL" "$MERGED" 
"$REMOTE"]
+               if {$base_stage ne {}} {
+                       set cmdline [list "$merge_tool_path" -f -d -c "wincmd 
J" \
+                               "$MERGED" "$LOCAL" "$BASE" "$REMOTE"]
+               } else {
+                       set cmdline [list "$merge_tool_path" -f -d -c "wincmd 
l" \
+                               "$LOCAL" "$MERGED" "$REMOTE"]
+               }
        }
        kdiff3 {
                if {$base_stage ne {}} {
-- 
1.8.1.1.10.g9255f3f

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to