Merge branch 'jk/refs-c-squelch-gcc'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"