Version Control With Subversion Source

Caret a Windows escape character.

Mentioned built-in merge tool.

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Postpone conflict resolution for certain areas,
not just file-by-file.

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Using the internal file merge tool
you can resolve the conflicts area-by-area.

Read-thru of SVNBook 1.8.

* en/book/ch02-basic-usage.xml
There have to be 2 whitespaces after the end of any sentence.
Found and fixed 2 sentences that ended with 1 whitespace.

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): minor fix.

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Tell that the new internal file
merge is available starting with SVN 1.8.

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Let's tell that the new merge tool
is a *file* merge tool.

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Let's tell that `m` (merge)
command is the main way to resolve conflicts interactively. Added
<screen> of the internal merge tool, too.

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.diff): Update other <screen> outputs for
`svn update` with conflicts to match SVN 1.8.