Submitter | phabricator |
---|---|
Date | April 6, 2022, 2:13 p.m. |
Message ID | <differential-rev-PHID-DREV-43tk7lnwdrezklolhlrm-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/50817/ |
State | New |
Headers | show |
Comments
Patch
diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -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 """