From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Aug 2008 07:40:53 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~349
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6670b348cb19c74a6d7f6943df4871eb0d8295f;p=git.git

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
---

c6670b348cb19c74a6d7f6943df4871eb0d8295f