Merge branch 'fc/doc-default-to-upstream-config' into jch
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"