Mercurial > hg
comparison tests/test-merge6.t @ 48347:1eeec02cd919
filemerge: rename _formatconflictmarker() since it formats a label
`_formatconflictmarker()`'s name made me think that it would create
something like `<<<<<<<` and maybe some more stuff after it, but it's
actually just the label that comes after on the same line. So let's
rename it to `_formatlabel()`. That's better aligned with the
variables the result is assigned it.
Differential Revision: https://phab.mercurial-scm.org/D11801
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 19 Nov 2021 18:14:25 -0800 |
parents | d0abd7949ea3 |
children |
comparison
equal
deleted
inserted
replaced
48345:d5a91701f7dc | 48347:1eeec02cd919 |
---|