Version Control With Subversion Source

(svn.branchemerge.basicmerging.reintegrate): Mention reintegrate's
increased flexibility re subtree merges in 1.7, but do it in
a footnote; this is really not something we want to encourage
(though apparently some folks like to work this way).