Submitter | phabricator |
---|---|
Date | Nov. 27, 2020, 10:09 p.m. |
Message ID | <differential-rev-PHID-DREV-fcmk5so6cviuirxg74ay-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47708/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -544,10 +544,10 @@ class mergeresult(object): - ''''An object representing result of merging manifests. + '''An object representing result of merging manifests. It has information about what actions need to be performed on dirstate - mapping of divergent renames and other such cases. ''' + mapping of divergent renames and other such cases.''' def __init__(self): """