Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 23 May 2007 07:16:11 +0000 (00:16 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 23 May 2007 07:16:11 +0000 (00:16 -0700)
commite97593693ed36da918413732c9ca4b09c3e9d213
tree9c06adffc5bf959829e20024fdadc4c9f8d9e230
parenta3342a2f52a5351739577f8773eab2a1db20b651
parentc80e07d4959591f5addcd48c7d42017b40c25f36
Merge branch 'maint'

* maint:
  Document branch.autosetupmerge.
Documentation/config.txt