From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 19 Jul 2007 00:00:36 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc3~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1c10a3f272ec0908e63bc105a5ffe94c1279fba;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  Force listingblocks to be monospaced in manpages
  Do not expect unlink(2) to fail on a directory.
---

c1c10a3f272ec0908e63bc105a5ffe94c1279fba