From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jan 2009 08:40:19 +0000 (-0800)
Subject: Merge branch 'maint-1.6.0' into maint
X-Git-Tag: v1.6.1.1~27
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed;p=git.git

Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Avoid spurious error messages on error mistakes.
  contrib/examples/README: give an explanation of the status of these files
---

1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed