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