author | Raphaël Gomès <rgomes@octobus.net> |
Mon, 28 Mar 2022 23:45:54 +0200 | |
changeset 49119 | 4c75f00b199e |
parent 49118 | 2c78dd3f11de |
child 49120 | 3df46f3a3d6c |
--- 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 """