Add support for registering custom merge drivers.#2107
Open
maskmaster wants to merge 2 commits intolibgit2:masterfrom
Open
Add support for registering custom merge drivers.#2107maskmaster wants to merge 2 commits intolibgit2:masterfrom
maskmaster wants to merge 2 commits intolibgit2:masterfrom
Conversation
Add unit tests for custom merge drivers.
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.
feature: Add support for registering custom merge drivers.
Add unit tests for custom merge drivers.
resolves #1710
Modeled in large parts after the existing Filters feature.
This feature adds the possibility to add custom merge drivers for content-aware merges for files like HTML, Json, etc.