summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mergetools/vimdiff4
1 files changed, 2 insertions, 2 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 1ddfbfcd78..74ea6d5479 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -9,8 +9,8 @@ merge_cmd () {
gvimdiff|vimdiff)
if $base_present
then
- "$merge_tool_path" -f -d -c 'wincmd J' \
- "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
+ "$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
+ "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
else
"$merge_tool_path" -f -d -c 'wincmd l' \
"$LOCAL" "$MERGED" "$REMOTE"