Skip to content

Commit 0f622c8

Browse files
ahoppenahoppen
authored
Merge pull request #2901 from ahoppen/6.1/conflict-marker-infinite-loop
[6.1] Fix an infinite loop if a conflict marker is found but it's not at the start of a new line
2 parents b721fa8 + b8450ea commit 0f622c8

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)