--- a/mercurial/filemerge.py Tue Nov 23 20:04:22 2021 +0100
+++ b/mercurial/filemerge.py Fri Nov 19 18:14:25 2021 -0800
@@ -846,7 +846,7 @@
return True, r, False
-def _formatconflictmarker(ctx, template, label, pad):
+def _formatlabel(ctx, template, label, pad):
"""Applies the given template to the ctx, prefixed by the label.
Pad is the minimum width of the label prefix, so that multiple markers
@@ -893,11 +893,11 @@
pad = max(len(l) for l in labels)
newlabels = [
- _formatconflictmarker(cd, tmpl, labels[0], pad),
- _formatconflictmarker(co, tmpl, labels[1], pad),
+ _formatlabel(cd, tmpl, labels[0], pad),
+ _formatlabel(co, tmpl, labels[1], pad),
]
if len(labels) > 2:
- newlabels.append(_formatconflictmarker(ca, tmpl, labels[2], pad))
+ newlabels.append(_formatlabel(ca, tmpl, labels[2], pad))
return newlabels