Merge branch 'jk/diff-driver-binary-doc' into maint
commitae830c211bfbf192bcefb821130fe4943daf4291
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Jan 2011 16:26:44 +0000 (19 08:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Jan 2011 16:26:44 +0000 (19 08:26 -0800)
tree12b2e5f2aedd31a599968fac42da18ad184e894d
parent8a59702ad888c8c399b096759c1c678ffeca5b03
parentab4356111afb28568bf1ad2e909b6ecf9f83a5e6
Merge branch 'jk/diff-driver-binary-doc' into maint

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