Merge branch 'rs/xcalloc-takes-nelem-first'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"