Merge branch 'en/dir-nonbare-embedded'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"