Merge branch 'mt/parallel-checkout-part-1'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"