use vimdiff for viewing and merging diffs