##// END OF EJS Templates
merge: remove spurious ' and trailing whitespace from triple-quoted string...
Augie Fackler -
r46552:10dbc80d default
parent child Browse files
Show More
@@ -544,10 +544,10 b' def _filternarrowactions(narrowmatch, br'
544
544
545
545
546 class mergeresult(object):
546 class mergeresult(object):
547 ''''An object representing result of merging manifests.
547 '''An object representing result of merging manifests.
548
548
549 It has information about what actions need to be performed on dirstate
549 It has information about what actions need to be performed on dirstate
550 mapping of divergent renames and other such cases. '''
550 mapping of divergent renames and other such cases.'''
551
551
552 def __init__(self):
552 def __init__(self):
553 """
553 """
General Comments 0
You need to be logged in to leave comments. Login now