merge_tools: allow setting conflict marker style per-tool #4951
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
4 tasks
scott2000
commented
Nov 22, 2024
scott2000
force-pushed
the
merge-tool-conflict-marker-style
branch
7 times, most recently
from
a587a02 to
00379a2
Compare
scott2000
force-pushed
the
merge-tool-conflict-marker-style
branch
from
00379a2 to
2279d2f
Compare
yuja
reviewed
Nov 24, 2024
scott2000
force-pushed
the
merge-tool-conflict-marker-style
branch
2 times, most recently
from
2a8c285 to
896e6f9
Compare
martinvonz
approved these changes
Nov 26, 2024
I left the "merge-tool-edits-conflict-markers" option unchanged, since removing it would likely break some existing configurations. It also seems like it could be useful to have a merge tool use the default conflict markers instead of requiring the conflict marker style to always be set for the merge tool (e.g. if a merge tool allows the user to manually edit the conflicts).
scott2000
force-pushed
the
merge-tool-conflict-marker-style
branch
from
896e6f9 to
1e547e6
Compare
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.
Follow-up to #4897.
Checklist
If applicable:
CHANGELOG.md