Merge branch 'pa/import-tars-long-names'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"