changeset 45940 | 10dbc80d4be7 |
parent 45917 | 721f765a34ac |
child 45942 | 89a2afe31e82 |
--- a/mercurial/merge.py Fri Nov 27 17:00:25 2020 -0500 +++ b/mercurial/merge.py Fri Nov 27 16:59:14 2020 -0500 @@ -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): """