Code

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)
commit62c666a7034a3aed6792280589bb78205781aa68
tree941ab0154ef4faf36b63cd725e386c85b072b698
parentc67359be45be74e1056d6293c6bb09ee6d00a54a
parent9e6c723087def70d001740db48cf042b77a1d9cd
Merge branch 'gp/maint-diffdoc' into maint

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