Code

Merge branch 'jk/diff-driver-binary-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Jan 2011 19:34:56 +0000 (11:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jan 2011 19:34:56 +0000 (11:34 -0800)
commit37ee62bc6b60b566e39c8ea9fbf34b23a9a39d2f
treee696089b5bdcdcf201fe6bedbee608ad7abb9903
parent4b297df9b2c0d91a8593bc026dc70553511cd09b
parentab4356111afb28568bf1ad2e909b6ecf9f83a5e6
Merge branch 'jk/diff-driver-binary-doc'

* jk/diff-driver-binary-doc:
  docs: explain diff.*.binary option
Documentation/gitattributes.txt