Patchwork D9428: merge: remove spurious ' and trailing whitespace from triple-quoted string

login
register
mail settings
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

phabricator - Nov. 27, 2020, 10:09 p.m.
durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9428

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

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):
         """