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)
* maint:
  Document branch.autosetupmerge.

1  2 
Documentation/config.txt

Simple merge