[2.1] Fix all empty conflict explanation messages #5378
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
rjbou
reviewed
Dec 5, 2022
rjbou
reviewed
Dec 5, 2022
kit-ty-kate
force-pushed
the
2.1-no-empty-conflict-msg
branch
from
21f3b7e
to
70194e8
Compare
kit-ty-kate
force-pushed
the
2.1-no-empty-conflict-msg
branch
from
70194e8
to
dacc3d5
Compare
rjbou
approved these changes
Dec 6, 2022
|
Appveyor is too slow to finish some of its run before its 1h timeout. I tried rebuilding 3 times, skipping. |
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.
Backports #5253 and #5263 to the
2.1branch.