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

merge tools: split DiffEditWorkingCopies from DiffWorkingCopies #3306

Merged
merged 2 commits into from
Mar 16, 2024

Conversation

ilyagr
Copy link
Collaborator

@ilyagr ilyagr commented Mar 16, 2024

As suggested by @yuja in #3296 (comment)

@ilyagr ilyagr marked this pull request as ready for review March 16, 2024 00:41
@ilyagr ilyagr force-pushed the dewc branch 2 times, most recently from 54e2642 to 6f50c97 Compare March 16, 2024 00:48
cli/src/merge_tools/diff_working_copies.rs Outdated Show resolved Hide resolved
cli/src/merge_tools/diff_working_copies.rs Outdated Show resolved Hide resolved
@ilyagr ilyagr merged commit 8600750 into jj-vcs:main Mar 16, 2024
16 checks passed
@ilyagr ilyagr deleted the dewc branch March 16, 2024 04:36
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