Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2011 23:48:59 +0000 (16:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2011 23:48:59 +0000 (16:48 -0700)
* maint:
  docs: document --textconv diff option

1  2 
Documentation/diff-options.txt

Simple merge