Mercurial > hg
comparison hgeditor @ 48561: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 | 1aee2ab0f902 |
children |
comparison
equal
deleted
inserted
replaced
48560:6ad70879d2bd | 48561:69e76b2aad3d |
---|