Merge branch 'cc/first-contrib-tutorial'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"