Merge branch 'bg/xcalloc-nmemb-then-size'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"