Merge branch 'maint'
commit395f65d438b13fb1fded88a330dc06c3b0951046
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2011 23:48:59 +0000 (6 16:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2011 23:48:59 +0000 (6 16:48 -0700)
treee7a2d4e7845eb1349de59aa07c5d9c6455f5263d
parent9901923cf0994582592a34128a466c58735621fd
parentd28790dc31ca1bcdca7254a6b9381b6c84e91271
Merge branch 'maint'

* maint:
  docs: document --textconv diff option
Documentation/diff-options.txt