chiark / gitweb /
merge: fix dependency reinsertion blurb to mention the need for the base to be merged...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 18 Apr 2012 20:44:08 +0000 (21:44 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 18 Apr 2012 20:44:08 +0000 (21:44 +0100)
commit3ca0fff3d7e2f140e888ff286360a19db1828035
treec36e89d6e4451e2a7b219a7c7d72841ecdb5264e
parent16c8cf55a226dcb5cd8ee0e7ba2b0f3d16ab39d0
merge: fix dependency reinsertion blurb to mention the need for the base to be merged first
merge.tex