Use diff3 style, not zdiff3 style
#341
Closed
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
Merged
|
@mernst is this really necessary? I would have to rerun all the gitmerge results since this affects the hashes. |
|
@benedikt-schesch zdiff3 lies about what lines were in the base file. Therefore, a tool that works from diffs (which is the way that we are using plume-lib merging) is unfairly disadvantaged by use of zdiff3. (It is now my belief that no one should ever use zdiff3. I thought it was merely more concise, but in fact it changes the semantics of the diff file.) |
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.
No description provided.