Merge branch 'jc/push-delete-nothing'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"