From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2011 23:48:59 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.7-rc0~111
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=395f65d438b13fb1fded88a330dc06c3b0951046;p=git.git

Merge branch 'maint'

* maint:
  docs: document --textconv diff option
---

395f65d438b13fb1fded88a330dc06c3b0951046