Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"