Use simple vimdiff as the diff and merge tool