Merge branch 'maint'
[git] / mergetools / vimdiff2
CommitLineData
073678b8 1. "$MERGE_TOOLS_DIR/vimdiff"