From: Junio C Hamano <junkio@cox.net>
Date: Wed, 23 May 2007 07:15:35 +0000 (-0700)
Subject: Merge branch 'maint-1.5.1' into maint
X-Git-Tag: v1.5.2.1~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c80e07d4959591f5addcd48c7d42017b40c25f36;p=git.git

Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
  Document branch.autosetupmerge.
---

c80e07d4959591f5addcd48c7d42017b40c25f36