* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging): 'subcommand' not 'command'.
Update language to reflect that 1.7 is the latest and greatest.
(svn.branchmerge.basicmerging.mergetracking): New sidebar on
merge tracking.
(svn.branchemerge.basicmerging.stayinsync): Passive voice fixes.
Minor wording tweak. Mention 'svn patch' in the 'Why Not Use
Patches Instead?' sidebar. Move explanation of
'--allow-mixed-revisions' option to a footnote. Typo fixes.
(svn.branchemerge.basicmerging.reintegrate): Passive voice fix.
(svn.branchmerge.basicmerging.mergeinfo): Wording tweak and typo
fix. Remove a tip that has no relevance in 1.7.
(svn.branchmerge.advanced.advancedsyntax): Rework a confusing
sentence.
(svn.branchmerge.nomergedata): Add a link to a relevant sidebar
and use the term 'mergeinfo' rather than 'merge tracking
information'.
