comparison mercurial/fileset.py @ 48586:2dbee604a4f0

simplemerge: clarify names of functions that render conflict markers Differential Revision: https://phab.mercurial-scm.org/D11975
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 11 Jan 2022 16:54:42 -0800
parents d4ba4d51f85f
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48585:c6649c53073f 48586:2dbee604a4f0