log mercurial/filemerge.py @ 48674:f7086f6173f8 stable

age author description
Tue, 07 Sep 2021 11:50:12 -0700 Kyle Lippincott filemerge: be more strict when detecting conflict markers, add `|` markers stable