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
Mon, 29 Mar 2021 01:52:06 +0200 Joerg Sonnenberger node: replace nullid and friends with nodeconstants class
Thu, 25 Mar 2021 18:02:08 +0100 Rapha?l Gom?s contributor: change mentions of mpm to olivia