Changeset View

Standalone View

	Show All 11 Lines
	from . import error			from . import error


	def checkunresolved(ms):			def checkunresolved(ms):
	if list(ms.unresolved()):			if list(ms.unresolved()):
	raise error.Abort(			raise error.Abort(
	_(b"unresolved merge conflicts (see 'hg help resolve')")			_(b"unresolved merge conflicts (see 'hg help resolve')")
	)			)
	if ms.mdstate() != b's' or list(ms.driverresolved()):
	raise error.Abort(
	_(b'driver-resolved merge conflicts'),
	hint=_(b'run "hg resolve --all" to resolve'),
	)