mergetools / gvimdiff3on commit Merge branch 'jk/index-pack-reduce-recheck' into maint (de62fe8)
   1. "$MERGE_TOOLS_DIR/vimdiff"