On 21/10/19 11:20PM, Fernando Ramos wrote: > This new vimdiff4 variant of the merge-tool opens three tabs... > One reason why this RFC should *not* be merged is that the same functionality can be achieved right now by simply adding these two lines to "~/.config/git/config": [mergetool "vimdiff4"] cmd = vim -f -d -c \"4wincmd w | wincmd J | tabnew | edit $LOCAL | vertical diffsplit $BASE | tabnew | edit $REMOTE | vertical diffsplit $BASE | 2tabprevious\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" \"$MERGED\" trustExitCode = true On the other hand, one reason to merge it is that this new windows/tabs arrangement is so useful when solving complex merges, that it would be nice to have it available by default for easier discoverablility. Let me know what you think :)
