This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D9430 formating: upgrade to black 20.8b1
Closed	durin42	D9429 osutil: reformat triple-quoted string so black doesn't confuse itself
Closed	durin42	D9428 merge: remove spurious ' and trailing whitespace from triple-quoted string

Diff 23744

	)			)
	else:			else:
	raise error.Abort(			raise error.Abort(
	_(b'conflict in file \'%s\' is outside narrow clone') % f			_(b'conflict in file \'%s\' is outside narrow clone') % f
	)			)


	class mergeresult(object):			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			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):			def __init__(self):
	"""			"""
	filemapping: dict of filename as keys and action related info as values			filemapping: dict of filename as keys and action related info as values
	diverge: mapping of source name -> list of dest name for			diverge: mapping of source name -> list of dest name for
	divergent renames			divergent renames
	renamedelete: mapping of source name -> list of destinations for files			renamedelete: mapping of source name -> list of destinations for files
	deleted on one side and renamed on other.			deleted on one side and renamed on other.