From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Sep 2011 21:30:49 +0000 (-0700)
Subject: Merge branch 'cb/maint-ls-files-error-report' into maint
X-Git-Tag: v1.7.6.4~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0b1cb60ab296476084b3d4766a943e2d62719b8;p=git.git

Merge branch 'cb/maint-ls-files-error-report' into maint

* cb/maint-ls-files-error-report:
  t3005: do not assume a particular order of stdout and stderr of git-ls-files
  ls-files: fix pathspec display on error
---

a0b1cb60ab296476084b3d4766a943e2d62719b8