make vimdiff default for merge/diff