mercurial at 47939: new changeset (1 on stable)

[Mercurial Commits]

New changeset (1 on stable) in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/053dd53a0b59
changeset:   47939:053dd53a0b59
branch:      stable
tag:         tip
parent:      47888:7538453ec322
user:        Kyle Lippincott <spectral at google.com>
date:        Tue Sep 07 11:50:12 2021 -0700
summary:     filemerge: be more strict when detecting conflict markers, add `|` markers

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg