diff -r 2c78dd3f11de -r 4c75f00b199e mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py Mon Mar 28 23:42:16 2022 +0200 +++ b/mercurial/pure/parsers.py Mon Mar 28 23:45:54 2022 +0200 @@ -278,7 +278,7 @@ self._mtime_ns = None def drop_merge_data(self): - """remove all "merge-only" from a DirstateItem + """remove all "merge-only" information from a DirstateItem This is to be call by the dirstatemap code when the second parent is dropped """