Merge branch 'jk/dont-count-existing-objects-twice'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"