Merge branch 'ws/request-pull-code-cleanup' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"