Merge branch 'gp/maint-diffdoc'
commit784c099a30368af4238e2713e6220688119239a1
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2007 23:12:04 +0000 (2 16:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2007 23:12:04 +0000 (2 16:12 -0700)
treea280047ee5d0a1ec02c57664e88ed05cdb9cffed
parent3e4bb087a18435b12eb82116e93af2887578e816
parent9e6c723087def70d001740db48cf042b77a1d9cd
Merge branch 'gp/maint-diffdoc'

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