Merge branch 'jn/mergetool-hideresolved-is-optional'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"