Version Control With Subversion Source

(svn.branchmerge.basicmerging.reintegrate): Put the reintegrate merge
into a separate section so we can xref it.
(svn.branchmerge.advanced.reintegratetwice): By popular demand, add
a new advanced merging section explaining how to continue using a
reintegrated branch without deleting and re-creating it.