Merge branch 'sb/diff-orderfile-config'
commit7fe5e637abc0529785a2b29b0c408d02191a6555
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jan 2014 19:34:11 +0000 (13 11:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jan 2014 19:34:54 +0000 (13 11:34 -0800)
tree78101488d38c79a77ef063d7ba399a8ff20aec30
parent540cc75f38c9787ed012fba81b2af365621b484b
parent0df49bef95fe1668805cdb76abadfb82a8956b6b
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