# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 2020-11-27 21:59:14
# Node ID 10dbc80d4be7709f685a2b11949196ecc537c69b
# Parent  66f6ca2b7aee3461a4a4a0160c532e51bdea697f

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

Differential Revision: https://phab.mercurial-scm.org/D9428

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -544,10 +544,10 @@ def _filternarrowactions(narrowmatch, br
 
 
 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):
         """