Merge branch 'gp/maint-diffdoc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2007 23:12:04 +0000 (16:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2007 23:12:04 +0000 (16:12 -0700)
* gp/maint-diffdoc:
  git-diff.txt: add section "output format" describing the diff formats

1  2 
Documentation/git-diff.txt

Simple merge