Skip to content

Commit

Permalink
Merge pull request #2901 from ahoppen/6.1/conflict-marker-infinite-loop
Browse files Browse the repository at this point in the history 
[6.1] Fix an infinite loop if a conflict marker is found but it's not at the start of a new line
  • Loading branch information
@ahoppen
ahoppen authored Dec 4, 2024
2 parents b721fa8 + b8450ea commit 0f622c8
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 0f622c8

Please sign in to comment.