From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Oct 2009 06:51:38 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf8fc21c69559684b81669ab929db2ff1f37b3d7;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  ls-files: die instead of fprintf/exit in -i error
---

bf8fc21c69559684b81669ab929db2ff1f37b3d7