* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.using.create): Correct a type in an example
and replace
(svn.branchmerge.basicmerging.stayinsync): Tweak definition of
automatic merging and add it to the index.
(svn.branchmerge.basicmerging.reintegrate): Add 'reintegrate merge'
to the index.
(svn.branchmerge.advanced.advancedsyntax): Use the term automatic
merge' where appropriate. Add 2-URL merge' to the index.
(svn.branchmerge.advanced.mergeconflicts): Wording tweaks and change
examples to use forthcoming ch 4 sample repos.
(svn.branchmerge.advanced.blockchanges): Change examples to use
forthcoming ch 4 sample repos and add example of --ignore-ancestry
merge.
(svn.branchmerge.advanced.reintegratetwice): Remove this section, it
doesn't apply to 1.8.
(svn.branchmerge.advanced.logblame): Update examples using sample repos.
(svn.branchmerge.advanced.ancestry): Add 'merge tracking, disabling'
to index.
