chiark / gitweb /
merge fixes/clarifications - sort out complex case D = C
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 22:25:11 +0000 (22:25 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 22:25:11 +0000 (22:25 +0000)
commit88703e57b78158a4ee558d4744e736e90fb008f0
tree914e039e9c5c7b14b3b1127c9c08bfdb8019cb2b
parentf11a862c007560f325ac57e618aef52e3c03d61c
merge fixes/clarifications - sort out complex case D = C
merge.tex