Merge branch 'et/add-chmod-x' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"