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.
Authored by: lyalyakin 2016-05-30
Parent: [r5149]
Child: [r5151]
