Skip to content

merge tools: split DiffEditWorkingCopies from DiffWorkingCopies#3306

Merged
ilyagr merged 2 commits into
jj-vcs:mainfrom
ilyagr:dewc
Mar 16, 2024
Merged

merge tools: split DiffEditWorkingCopies from DiffWorkingCopies#3306
ilyagr merged 2 commits into
jj-vcs:mainfrom
ilyagr:dewc

Conversation

@ilyagr
Copy link
Copy Markdown
Contributor

@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
Comment thread cli/src/merge_tools/diff_working_copies.rs Outdated
Comment thread cli/src/merge_tools/diff_working_copies.rs Outdated
@ilyagr ilyagr merged commit 8600750 into jj-vcs:main Mar 16, 2024
@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