From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Nov 2007 02:56:55 +0000 (-0800)
Subject: Merge branch 'gp/maint-diffdoc' into maint
X-Git-Tag: v1.5.3.6~40
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/62c666a7034a3aed6792280589bb78205781aa68?ds=inline;hp=--cc

Merge branch 'gp/maint-diffdoc' into maint

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

62c666a7034a3aed6792280589bb78205781aa68