Mercurial > public > mercurial-scm > hg-stable
diff mercurial/httppeer.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 | 04688c51f81f |
children | a0da5075bca3 |