Merge branch 'maint'

* maint: docs: document --textconv diff option

Junio C Hamano committed Jul 6, 2011 at 16:48 UTC 395f65d438b13fb1fded88a330dc06c3b0951046

No changes.