This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D11903 simplemerge: don't calculate conflict labels when resolving automatically
Closed	martinvonz	D11902 simplemerge: remove now-unused `localorother` argument from `merge_lines()`
Closed	martinvonz	D11901 simplemerge: add a specialized function for "union", "local", "other"
Closed	martinvonz	D11887 simplemerge: make `localorother` a "mode" instead of a separate thing
Closed	martinvonz	D11886 simplemerge: avoid a call to `pycompat.strkwargs()`
Closed	martinvonz	D11879 simplemerge: stop merging file flags
Closed	martinvonz	D11885 filemerge: stop returning always-`True` value
Closed	martinvonz	D11878 filemerge: remove unused `orig` argument from tool functions
Closed	martinvonz	D11877 filemerge: stop passing around 3 unused `None` values in `files` argument
Closed	martinvonz	D11876 filemerge: rename backup variables from `back` to `backup`
Closed	martinvonz	D11925 filemerge: remove leftover documentation of removed argument

Diff 31482

	# shouldn't delete.			# shouldn't delete.
	if d and uselocalpath:			if d and uselocalpath:
	util.unlink(d)			util.unlink(d)


	def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):			def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
	"""perform a 3-way merge in the working directory			"""perform a 3-way merge in the working directory

	premerge = whether this is a premerge
	mynode = parent node before merge			mynode = parent node before merge
	orig = original local filename before merge			orig = original local filename before merge
	fco = other file context			fco = other file context
	fca = ancestor file context			fca = ancestor file context
	fcd = local file context for current/destination file			fcd = local file context for current/destination file

	Returns whether the merge is complete, the return value of the merge, and			Returns whether the merge is complete, the return value of the merge, and
	a boolean indicating whether the file was deleted from disk."""			a boolean indicating whether the file was deleted from disk."""