tool configuration from Chapter 2 to Chapter 7").
* src/en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Drop specifics (and wrong ones, at
that) of the external editor configuration in favor of a pointer
the pre-existing section which covers that topic. Also, drop
specifics of the external merge tool configuration in favor of a
pointer to...
* src/en/book/ch07-customizing-svn.xml
(svn.advanced.externaldifftools.merge): ...this new section.
(svn.advanced.externaldifftools, svn.advanced.externaldifftools.diff3):
Weave some more general information about the external merge tool
-- and how it differs from the diff3 tool -- into these text, and
try to consistently refer to the diff3 tool as a "three-way
differencing" tool rather than a "merge" tool.
