Merge branch 'hv/config-from-blob'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"