Support long diff conflict markers#150443
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Feb 8, 2026
Merged
Conversation
rustbot
added
S-waiting-on-review
Collaborator
This comment has been minimized.
This comment has been minimized.
estebank
force-pushed
the
long-diff-markers
branch
from
8dbba8e to
c0fe160
Compare
This comment has been minimized.
This comment has been minimized.
estebank
force-pushed
the
long-diff-markers
branch
from
c0fe160 to
8bf0ba1
Compare
This comment has been minimized.
This comment has been minimized.
git can be configured to use more than 7 characters for conflict markers, and jj automatically uses longer conflict markers when the text contains any char sequence that could be confused with conflict markers. Ensure that we only point at markers that are consistent with the start marker's length. Ensure that we only consider char sequences at the beginning of a line as a diff marker.
estebank
force-pushed
the
long-diff-markers
branch
from
8bf0ba1 to
ebd4bc9
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Member
|
@bors r+ |
Contributor
rust-bors
bot
added
S-waiting-on-bors
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 8, 2026
Rollup of 5 pull requests Successful merges: - #150443 (Support long diff conflict markers) - #151887 (Remove some unnecessary `try`-related type annotations) - #152037 (Suppress unused_mut lint if mutation fails due to borrowck error) - #152067 (Weaken `assert_dep_node_not_yet_allocated_in_current_session` for multiple threads) - #151227 (Document `-Zcache-proc-macros`)
rust-timer
added a commit
that referenced
this pull request
Feb 8, 2026
Rollup merge of #150443 - estebank:long-diff-markers, r=jackh726 Support long diff conflict markers git can be configured to use more than 7 characters for conflict markers, and jj automatically uses longer conflict markers when the text contains any char sequence that could be confused with conflict markers. Ensure that we only point at markers that are consistent with the start marker's length. Ensure that we only consider char sequences at the beginning of a line as a diff marker. Fix #150352.
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
4 participants
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.
git can be configured to use more than 7 characters for conflict markers, and jj automatically uses longer conflict markers when the text contains any char sequence that could be confused with conflict markers. Ensure that we only point at markers that are consistent with the start marker's length.
Ensure that we only consider char sequences at the beginning of a line as a diff marker.
Fix #150352.