chiark / gitweb /
merge fixes/clarifications - relax Foreign Merges
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 21:55:38 +0000 (21:55 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 21:55:38 +0000 (21:55 +0000)
commitcdbdcb99ffda2c58f9f41e444cbc385e11cd0ab8
treef4f0b58ac68da5a0a9cc6cd5a8f4e47f6d219477
parent65959570cc03ee3de82eefcb2dc51d7ae9f3aebc
merge fixes/clarifications - relax Foreign Merges
merge.tex