Mercurial > public > mercurial-scm > hg-stable
comparison setup.py @ 48589:69e76b2aad3d
simplemerge: split out function for rendering :merge3 conflict markers
The results in some duplicate, but the code is very straight-forward
and I think it's worth it to have each conflict marker style in a
separate function.
Differential Revision: https://phab.mercurial-scm.org/D11978
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 11 Jan 2022 16:23:10 -0800 |
| parents | 23ce9e7bf1e5 |
| children | 6cfa30681a1d |
comparison
equal
deleted
inserted
replaced
| 48588:6ad70879d2bd | 48589:69e76b2aad3d |
|---|