Merge branch 'jk/suppress-clang-warning'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"