Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"