--- a/mercurial/filemerge.py Thu Dec 24 11:21:23 2020 -0500
+++ b/mercurial/filemerge.py Thu Feb 04 13:05:51 2021 -0800
@@ -546,7 +546,7 @@
def _imerge3alwaysgood(*args, **kwargs):
# Like merge3, but record conflicts as resolved with markers in place.
#
- # This is used for `hg diff --merge` to show the differences between
+ # This is used for `diff.merge` to show the differences between
# the auto-merge state and the committed merge state. It may be
# useful for other things.
b1, junk, b2 = _imerge3(*args, **kwargs)