Merge branch 'as/check-ignore'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"