@c0dec0dec0de @b0rk @jackie I actually do use vimdiff, but haven't ever tried it for three way merge.