1. 2006-09-25 [10] [darcs-conflicts] three way merging insights from so6 darcs-con Pascal Molli 2. 2006-09-14 [1] [darcs-conflicts] some experimental code darcs-con Arjan Boeijin