Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Jul 2007 00:00:36 +0000 (17:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Jul 2007 00:00:36 +0000 (17:00 -0700)
commitc1c10a3f272ec0908e63bc105a5ffe94c1279fba
treee81e4266bdc05f7015507d89aa357e8cc2005308
parent726f9bced9717fb8b3c1e91228be1cdce514a98e
parent281a53bb79786a6d7e54f9715cc8ad46fc2bdb0e
Merge branch 'maint'

* maint:
  Force listingblocks to be monospaced in manpages
  Do not expect unlink(2) to fail on a directory.
Documentation/asciidoc.conf
entry.c