Redirecting to
https://leastfixedpoint.com/tonyg/kcbbs/lshift_archive/diff3-merging-and-distributed-version-control-20080606.html
(Please update the link that led you here)