diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:13:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:13:34 -0800 |
| commit | 82c17b7a9ae1c78ce4891ad272f78fd2cd181ded (patch) | |
| tree | 80fc197f62f73001fc213011474369dbe0a39708 | |
| parent | d6a5088f6744e0fe19ed1a43700f400b334705f4 (diff) | |
| parent | 2300328cb209762a14e32525cfaa91778681f059 (diff) | |
| download | git-82c17b7a9ae1c78ce4891ad272f78fd2cd181ded.tar.gz | |
Merge branch 'dw/mergetool-vim-window-shuffle'
The vimdiff backend for "git mergetool" has been tweaked to arrange
and number buffers in the order that would match the expectation of
majority of people who read left to right, then top down and assign
buffers 1 2 3 4 "mentally" to local base remote merge windows based
on that order.
* dw/mergetool-vim-window-shuffle:
mergetool: reorder vim/gvim buffers in three-way diffs
| -rw-r--r-- | mergetools/vimdiff | 4 |
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" |