From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2007 23:12:04 +0000 (-0700)
Subject: Merge branch 'gp/maint-diffdoc'
X-Git-Tag: v1.5.4-rc0~288
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=784c099a30368af4238e2713e6220688119239a1;p=git.git

Merge branch 'gp/maint-diffdoc'

* gp/maint-diffdoc:
  git-diff.txt: add section "output format" describing the diff formats
---

784c099a30368af4238e2713e6220688119239a1