mergetools / vimdiff3on commit Merge branch 'jk/tighten-alloc' into maint (b7a6ec6)
   1. "$MERGE_TOOLS_DIR/vimdiff"