mergetools / gvimdiffon commit Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint (80f0743)
   1. "$MERGE_TOOLS_DIR/vimdiff"