Merge branch 'pw/patience-diff-clean-up'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"