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