Merge branch 'jk/rev-list-count-with-bitmap' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"