Redirecting to
https://leastfixedpoint.com/tonyg/kcbbs/lshift_archive/mercurial-merge-technique-20080619.html
(Please update the link that led you here)