Page MenuHomePhabricator

filemerge: be more strict when detecting conflict markers, add `|` markers

Authored by spectral on Sep 7 2021, 3:12 PM.



I received a user complaint about detecting a line that contained 78 =
followed by */ as a conflict marker. We'll never generate that, we generate 7
identical characters and either the end of the line, or a space. Let's be
explicit about detecting exactly what we produce to reduce the chances of a
false positive.

While we're here, add ||||||| as a detected conflict marker (generated with
the keep-merge3 style conflicts).

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Sep 7 2021, 3:12 PM
Alphare accepted this revision.Sep 8 2021, 8:58 AM
This revision is now accepted and ready to land.Sep 8 2021, 8:58 AM

I'll send this on stable since I would say that's a bug.

pulkit accepted this revision.Sep 8 2021, 2:12 PM
pulkit added a subscriber: pulkit.

I will queue this for stable branch.