From: Junio C Hamano <junkio@cox.net>
Date: Wed, 23 May 2007 07:16:11 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~207
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e97593693ed36da918413732c9ca4b09c3e9d213;p=git.git

Merge branch 'maint'

* maint:
  Document branch.autosetupmerge.
---

e97593693ed36da918413732c9ca4b09c3e9d213