Merge branch 'ps/config-env-option-with-separate-value'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"