From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Aug 2007 08:37:10 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc5~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6954452ecf757523b31d6eaaf7e00c7a2d91e46;p=git.git

Merge branch 'maint'

* maint:
  apply: remove directory that becomes empty by renaming the last file away
  setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
---

a6954452ecf757523b31d6eaaf7e00c7a2d91e46