Mercurial > public > mercurial-scm > hg-stable

comparison 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
comparison
equal deleted inserted replaced
45954:66f6ca2b7aee 45955:10dbc80d4be7
542 _(b'conflict in file \'%s\' is outside narrow clone') % f 542 _(b'conflict in file \'%s\' is outside narrow clone') % f
543 ) 543 )
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 """
554 filemapping: dict of filename as keys and action related info as values 554 filemapping: dict of filename as keys and action related info as values
555 diverge: mapping of source name -> list of dest name for 555 diverge: mapping of source name -> list of dest name for