Merge branch 'jk/index-pack-w-more-threads'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"