Merge branch 'cc/doc-filter-branch-typofix' into maint
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"