Add support for using external 3-way merge tool when handling @config items #2317
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
bapt
requested changes
Sep 24, 2024
|
So, no need for |
bapt
reviewed
Oct 8, 2024
bapt
reviewed
Oct 8, 2024
bapt
reviewed
Oct 8, 2024
bapt
reviewed
Oct 29, 2024
…items The introduced MERGETOOL config option expects a value in form "/path/to/program %b %l %r %o" where * "%b" is the file containing the original config shipped by the previous version of the package * "%l" is the file containing the current config (%b that is possibly altered by the user) * "%r" is the new config that is going to be installed by the new package * "%o" is the file that should be created by the too and contain the merge result If the merge tool return a non-zero code, pkg will attempt to the merging using a builtin algorithm. Sponsored by: Future Crew, LLC
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.
The introduced MERGETOOL config option expects a value in form "/path/to/program %b %l %r %o" where
If the merge tool return a non-zero code, pkg will attempt to the merging using a builtin algorithm.