mergetools / gvimdiff2on commit Merge branch 'js/regexec-buf' into maint (300e95f)
   1. "$MERGE_TOOLS_DIR/vimdiff"