Merge branch 'fc/master' into travis-ci
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"