Add support for ZDiff3 #2171
Open
Add support for ZDiff3 #2171
Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This pull request adds support for the new
ZDiff3merge conflict file strategy in LibGit2Sharp addressing #1976, alongside updates to enable and test this functionality. The changes include extending enums and internal flags, updating the mapping logic, and introducing a new test repository and test case to verify the behavior.Feature: ZDiff3 Conflict File Strategy Support
ZDiff3option to theCheckoutFileConflictStrategyenum to support zealous diff3 conflict file formatting.GIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3andGIT_MERGE_FILE_STYLE_ZDIFF3) to enable the new strategy at the core level. [1] [2]CheckoutStrategyFromFileConflictStrategyto handle the newZDiff3strategy.Testing: New Repository and Test Case
mergeconflict_testrepo_wd) and supporting files to facilitate testing of merge conflict scenarios with different file strategies.CanSpecifyMergeConflictFileStrategyinMergeFixture.csto verify that the merge conflict file strategies (Merge,Diff3,ZDiff3) produce the expected file outputs.