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

diff: add a file-by-file variant for external diff tools #3982

Merged
merged 1 commit into from
Jul 4, 2024
Merged

diff: add a file-by-file variant for external diff tools #3982

merged 1 commit into from
Jul 4, 2024

Conversation

fowles
Copy link
Collaborator

@fowles fowles commented Jun 28, 2024 •
edited
Loading

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

@fowles fowles mentioned this pull request Jun 28, 2024
Open
@yuja
Copy link
Collaborator

yuja commented Jun 28, 2024

Just for reference, there are some discussion in #3696
(I haven't reviewed the implementation yet)

@fowles fowles requested review from martinvonz and yuja June 29, 2024 03:15
yuja
yuja reviewed Jun 29, 2024
View reviewed changes
cli/src/diff_util.rs Outdated Show resolved Hide resolved
cli/src/diff_util.rs Show resolved Hide resolved
cli/src/config-schema.json Outdated Show resolved Hide resolved
@fowles fowles force-pushed the diff branch 3 times, most recently from a08d724 to 2cae494 Compare June 29, 2024 21:02
@fowles fowles requested a review from yuja June 29, 2024 21:50
ilyagr
ilyagr reviewed Jun 30, 2024
View reviewed changes
docs/config.md Show resolved Hide resolved
ilyagr
ilyagr reviewed Jun 30, 2024
View reviewed changes
cli/src/diff_util.rs Outdated Show resolved Hide resolved
yuja
yuja reviewed Jun 30, 2024
View reviewed changes
cli/src/config-schema.json Outdated Show resolved Hide resolved
cli/src/diff_util.rs Outdated Show resolved Hide resolved
cli/src/diff_util.rs Show resolved Hide resolved
ilyagr
ilyagr reviewed Jun 30, 2024
View reviewed changes
cli/src/diff_util.rs Outdated Show resolved Hide resolved
ilyagr
ilyagr reviewed Jun 30, 2024
View reviewed changes
cli/src/config-schema.json Outdated Show resolved Hide resolved
@fowles fowles force-pushed the diff branch 3 times, most recently from ff82995 to 46c1039 Compare July 1, 2024 16:38
@fowles fowles enabled auto-merge (rebase) July 1, 2024 22:28
yuja
yuja approved these changes Jul 2, 2024
View reviewed changes
Copy link
Collaborator

@yuja yuja left a comment

Choose a reason for hiding this comment

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

Thanks.

lib/src/file_util.rs Outdated Show resolved Hide resolved
cli/src/diff_util.rs Show resolved Hide resolved
cli/src/diff_util.rs Outdated Show resolved Hide resolved
cli/src/merge_tools/external.rs Outdated Show resolved Hide resolved
cli/src/merge_tools/external.rs Outdated Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
@fowles fowles disabled auto-merge July 2, 2024 16:15
@fowles fowles merged commit aaa99e6 into jj-vcs:main Jul 4, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joyously joyously joyously left review comments

@ilyagr ilyagr ilyagr left review comments

@yuja yuja yuja approved these changes

@martinvonz martinvonz Awaiting requested review from martinvonz

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

Successfully merging this pull request may close these issues.
5 participants
@fowles @yuja @martinvonz @ilyagr @joyously