Merge branch 'mp/diff-algo-config'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"