Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 45955:10dbc80d4be7

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 Differential Revision: https://phab.mercurial-scm.org/D9428
author Augie Fackler <raf@durin42.com>
date Fri, 27 Nov 2020 16:59:14 -0500
parents 721f765a34ac
children 89a2afe31e82
line wrap: on
line diff
--- 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):
         """