Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revset: fix copy-paste error in conflict() deprecation message #4530

Merged
merged 1 commit into from
Sep 25, 2024

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Sep 25, 2024

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@yuja yuja enabled auto-merge (rebase) September 25, 2024 07:16
@yuja yuja merged commit 6cc76ba into jj-vcs:main Sep 25, 2024
18 checks passed
@yuja yuja deleted the push-ksozpnpkwosq branch September 25, 2024 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants