> +			die ("cannot continue merging.");

This really isn't acceptable.  We're not monotone or one of those
projects that thinks that merging is hard.  Merging is *easy*.

		-- Linus Torvalds