Merge branch 'en/stash-apply-sparse-checkout'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"