This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	spectral	D4072 resolve: add commands.resolve.mark-check=abort to tweakdefaults
	Closed	spectral	D4071 resolve: graduate resolve.mark-check from experimental, add docs

Diff 9902

	# Grep working directory by default.			# Grep working directory by default.
	grep.all-files = True			grep.all-files = True
	# Make `hg status` emit cwd-relative paths by default.			# Make `hg status` emit cwd-relative paths by default.
	status.relative = yes			status.relative = yes
	# Refuse to perform an `hg update` that would cause a file content merge			# Refuse to perform an `hg update` that would cause a file content merge
	update.check = noconflict			update.check = noconflict
	# Show conflicts information in `hg status`			# Show conflicts information in `hg status`
	status.verbose = True			status.verbose = True
				# Refuse to perform `hg resolve --mark` on files that still have conflict
				# markers
				resolve.mark-check = abort

	[diff]			[diff]
	git = 1			git = 1
	showfunc = 1			showfunc = 1
	word-diff = 1			word-diff = 1
	"""			"""

	samplehgrcs = {			samplehgrcs = {