Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps diff to 3.5.0 and updates ancestor dependency vscode. These dependencies need to be updated together.
Updates
diff
from 3.3.1 to 3.5.0Changelog
Sourced from diff's changelog.
Commits
e9ab948
v3.5.0b73884c
Update release notes8953021
Update release notes1023590
Omit redundant slice in join method of diffArraysc72ef4a
Add missing test coverageb9ef24f
Support patches with empty lines10aaabb
Support patches with empty lines196d3aa
Support patches with empty linese24d789
Support patches with empty lines8616a02
Support patches with empty linesUpdates
vscode
from 1.1.21 to 1.1.37Commits
c871436
v1.1.37e55dfe8
Clean up for new releasefaa0254
Merge pull request #170 from microsoft/pine/15471ff0ef
Fix #154216c61a
Merge pull request #169 from microsoft/dependabot/npm_and_yarn/https-proxy-ag...e1e0c6c
Bump https-proxy-agent from 2.2.1 to 2.2.40090df8
v1.1.3650e9a97
Add a migration notice1688fb3
Use an accurate repository field in package.json (#160)f6fef4d
v1.1.35Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)You can disable automated security fix PRs for this repo from the Security Alerts page.