Merge branch 'ls/p4-lfs'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"