Dependabot 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](https://github.com/wonyee/vscode-cocoslua/network/alerts).
Bumps diff to 3.5.0 and updates ancestor dependency vscode. These dependencies need to be updated together.
Updates
difffrom 3.3.1 to 3.5.0Changelog
Sourced from diff's changelog.
Commits
e9ab948v3.5.0b73884cUpdate release notes8953021Update release notes1023590Omit redundant slice in join method of diffArraysc72ef4aAdd missing test coverageb9ef24fSupport patches with empty lines10aaabbSupport patches with empty lines196d3aaSupport patches with empty linese24d789Support patches with empty lines8616a02Support patches with empty linesUpdates
vscodefrom 1.1.34 to 1.1.37Commits
c871436v1.1.37e55dfe8Clean up for new releasefaa0254Merge pull request #170 from microsoft/pine/15471ff0efFix #154216c61aMerge pull request #169 from microsoft/dependabot/npm_and_yarn/https-proxy-ag...e1e0c6cBump https-proxy-agent from 2.2.1 to 2.2.40090df8v1.1.3650e9a97Add a migration notice1688fb3Use an accurate repository field in package.json (#160)f6fef4dv1.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](https://github.com/wonyee/vscode-cocoslua/network/alerts).