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

cli: status: evaluate conflicts revset as a user expression #3636

Merged
merged 3 commits into from
May 7, 2024

Conversation

yuja
Copy link
Collaborator

@yuja yuja commented May 7, 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 added 3 commits May 7, 2024 10:52
Otherwise, it would panic if immutable_heads() contained unresolved symbols.
…estry

This should be cheaper than using a generic difference expression.
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@yuja yuja merged commit 0a5c98d into jj-vcs:release-0.17.1 May 7, 2024
16 checks passed
@yuja yuja deleted the push-zstvlyrstwss branch May 7, 2024 13:10
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