chiark / gitweb /
Merge remote-tracking branch 'remotes/dgit/dgit/sid'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:04:22 +0000 (20:04 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:04:22 +0000 (20:04 +0000)
commitc46b09429cb3309bfb32fd57c294c9dc4d5cf6e9
tree224e0c91ba5ca3b53b0a669a0dc12d8f73cea662
parentee44bd0c26f196646d33b46d7c98e18952f4ca21
parentdcb3df3fda85c612a887127d5357806238c72f0b
Merge remote-tracking branch 'remotes/dgit/dgit/sid'

Done with merge -s ours.  We are a descendant of this, logically
speaking, although the archive version is missing .gitignore.