]> Pileus Git - ~andy/git/commitdiff
Merge branch 'sb/diff-orderfile-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jan 2014 19:34:11 +0000 (11:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jan 2014 19:34:54 +0000 (11:34 -0800)
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


Trivial merge