mergetools / gvimdiff2on commit Merge branch 'jk/index-pack-correct-depth-fix' into maint (68447f0)
   1. "$MERGE_TOOLS_DIR/vimdiff"