* 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. Discovered during the read-thru process.
* en/book/ch02-basic-usage.xml.
(svn.tour.cycle.resolve): Update <screen> output to match the one
SVN 1.8 produces and add new new (m) option to the list.