Merge branch 'es/doc-clean-outdated-tools' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"