Merge branch 'ta/config-set'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"