Mercurial > hg
comparison mercurial/templatefuncs.py @ 48557:c6649c53073f
simplemerge: make merge_lines() a free function
IMO, the rendering of a conflict as text with merge markers should be
separate from the code for resolving conflicts. The latter is what
`Merge3Text` is mostly about already.
Differential Revision: https://phab.mercurial-scm.org/D11974
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 07 Jan 2022 22:16:22 -0800 |
| parents | a407fe56d6e8 |
| children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
| 48556:ce8c82a5cd65 | 48557:c6649c53073f |
|---|