From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Jan 2014 19:34:11 +0000 (-0800)
Subject: Merge branch 'sb/diff-orderfile-config'
X-Git-Tag: v1.9-rc0~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7fe5e637abc0529785a2b29b0c408d02191a6555?ds=inline;hp=--cc

Merge branch 'sb/diff-orderfile-config'

Finishing touches to avoid casting unnecessary detail in stone.

* sb/diff-orderfile-config:
diff test: reading a directory as a file need not error out
---

7fe5e637abc0529785a2b29b0c408d02191a6555