mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
Merge branch 'dw/mergetool-vim-window-shuffle' into maint
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
This commit is contained in:
commit
2263a05907
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue