* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging.mergetracking): Minor working tweak,
it's not just for bug fixes that we want a 1.8 client.
(svn.branchmerge.basicmerging.stayinsync): Introduce the
new-in-1.8 terminology of "automatic" merges. Update examples
to use forthcoming ch4 demo repository.
(Keeping a Branch in Sync Without Merge Tracking): Redo the
examples in this sidebar to use an old (1.4.6) client and the
demo repository. The examples still work fine with a 1.5+ client
but the 1.4 client better keeps less hidden and (IMHO) makes for
a better example.
(Why Not Use Patches Instead?): Use demo repository in this sidebar's
examples.
(svn.branchmerge.basicmerging.stayinsync.subtree): Tweak some awkward
wording.
