merge_tools: use right_file_mode in make_diff_files
#2572
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
martinvonz
reviewed
Nov 11, 2023
There was a problem hiding this comment.
LGTM. @arxanas, does this seem like a strict improvement to you or do you see any issues with it?
|
@crackcomm You'll need to update the snapshot tests either by copy-and-paste or by downloading the helper tool https://insta.rs/ |
yup, I was just waiting for your review. |
See the issue jj-vcs#2548 for more context.
|
@crackcomm thank you for the fix! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See the issue #2548 for more context.
It fixes the initially posted issue but it could remain open until other related issues are addressed by fixing the integration with
scm-record, at least until another issue is opened to replace it.Checklist
If applicable:
CHANGELOG.md