Document branch.autosetupmerge.
commit9902387d20e7a73662a97f5c4b66ba4ec80dc9ce
authorPaolo Bonzini <paolo.bonzini@lu.unisi.ch>
Wed, 23 May 2007 05:07:54 +0000 (23 07:07 +0200)
committerJunio C Hamano <junkio@cox.net>
Wed, 23 May 2007 05:42:42 +0000 (22 22:42 -0700)
treed8d0b52f583084fb445e2b4f7c8851e2a4365be6
parent0ba956d331e4c14fb1600a62044492c6c27af71a
Document branch.autosetupmerge.

This patch documents the branch.autosetupmerge config option, added
by commit 0746d19a.

Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/config.txt