Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2009 06:51:38 +0000 (23:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2009 06:51:38 +0000 (23:51 -0700)
commitbf8fc21c69559684b81669ab929db2ff1f37b3d7
treedd426df77f7cde2b6f68c95b36ce3353c68b363b
parent651aef3428d9688e3fdffc6760380ead47debb9f
parentac78b009398f8cab1f57d1ef62db21ac95e11ed1
Merge branch 'maint'

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