mergetools / vimdiff2on commit Merge branch 'jk/fewer-pack-rescan' (79bafd2)
   1. "$MERGE_TOOLS_DIR/vimdiff"