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.

Sign up for GitHub

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

Jump to bottom

merged_tree: remove dead code from ConflictIterator #2604

Merged
merged 3 commits into from
Nov 20, 2023
Merged

merged_tree: remove dead code from ConflictIterator #2604

merged 3 commits into from
Nov 20, 2023

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Nov 20, 2023

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

martinvonz
martinvonz approved these changes Nov 20, 2023
View reviewed changes
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.

I apparently missed a few cleanups. Thanks!

@yuja yuja merged commit 16620e0 into jj-vcs:main Nov 20, 2023
15 checks passed
@yuja yuja deleted the push-rlvskknzvwvm branch November 20, 2023 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvonz martinvonz martinvonz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yuja @martinvonz