Merge branch 'da/p4merge-mktemp-fix'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"