Merge branch 'rs/patch-id-with-incomplete-line'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"