Merge branch 'mf/submodule-summary-with-correct-repository'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"