diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:15:40 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:15:40 +0900 |
| commit | e19a80ac46c1201d1b95a6a88ffc3ba412109424 (patch) | |
| tree | 802b6758c0c27ae910f40e1b4862cb72a71eee9f /mergetools | |
| parent | 648e7b0e4abd36a25609c8d0fabd533cf515918d (diff) | |
| download | git-e19a80ac46c1201d1b95a6a88ffc3ba412109424.tar.gz git-e19a80ac46c1201d1b95a6a88ffc3ba412109424.tar.bz2 git-e19a80ac46c1201d1b95a6a88ffc3ba412109424.zip | |
Imported Upstream version 2.7.2upstream/2.7.2
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/vimdiff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 1ddfbfcd..74ea6d54 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" |