Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove spurious ' and trailing whitespace from triple-quoted string
authorAugie Fackler <raf@durin42.com>
Fri, 27 Nov 2020 16:59:14 -0500
changeset 45955 10dbc80d4be7
parent 45954 66f6ca2b7aee
child 45956 346af7687c6f
merge: remove spurious ' and trailing whitespace from triple-quoted string Differential Revision: https://phab.mercurial-scm.org/D9428
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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):
         """
hg-stable