Merge branch 'rr/triangle'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"