mergetools / gvimdiff3on commit Merge branch 'js/regexec-buf' into maint (68eb7b1)
   1. "$MERGE_TOOLS_DIR/vimdiff"