Merge branch 'jc/object-names-are-not-sha-1'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"