Merge branch 'maint-2.0' into maint-2.1
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"