Merge branch 'fc/config/mode' into integration
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"