Merge branch 'ph/tag-force-no-warn-on-creation'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"