Merge branch 'maint'
commitc6670b348cb19c74a6d7f6943df4871eb0d8295f
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Aug 2008 07:40:53 +0000 (19 00:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Aug 2008 07:40:53 +0000 (19 00:40 -0700)
treeefb4f9ff112962f11197fb8250261061f58bea39
parent2ebc02d32a4360da2cf69c2b5f5bfad0716d42b0
parent26e08a0190cb3354e43bab13ea693a5c826a8fe1
Merge branch 'maint'

* maint:
  t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
  adapt git-cvsserver manpage to dash-free syntax
  mailinfo: re-fix MIME multipart boundary parsing