Merge branch 'ep/make-phoney'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"