Set vimdiff as a defualt diff and merge tools
vim-blockle
vim-eunuch