Merge branch 'gp/maint-diffdoc' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Nov 2007 02:56:55 +0000 (18:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Nov 2007 02:56:55 +0000 (18:56 -0800)
* gp/maint-diffdoc:
  git-diff.txt: add section "output format" describing the diff formats


Trivial merge