diff and mergetools are in vimdiff