Question

Title really says it all. There is the -O option for opening splits vertically, and -o for horizontally, but trying to mix them doesn’t seem to work.

My goal is to use g/vimdiff for 3-way file merging in mercurial in a way more like kdiff3 does. This method would have the 3 files to be merged split into 3 vertical tabs across the top (my local version, the other version of the file I am merging it with, and the base version between the two), while the “output”, or results of the merge, is a large horizontal tab stretched across the bottom.

Answer 1

This is a little kludgy, but it works:

vim -c "wincmd J" -O base diff1 diff2

(That’s a verbatim control-W there)

Maybe there’s a more elegant method, but this simply loads all of them as vertical and then moves the active (first) one to the bottom.