use vimdiff for merging and difftool