Merge branch 'jn/contrib-remove-vim'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"