mergetools / gvimdiff2on commit Merge branch 'jk/pack-name-cleanups' into maint (ba5e05f)
   1. "$MERGE_TOOLS_DIR/vimdiff"