mergetools / gvimdiff2on commit Merge branch 'jk/pack-idx-corruption-safety' into maint (7deb48a)
   1. "$MERGE_TOOLS_DIR/vimdiff"