Version Control With Subversion Source

* en/book/ch02-basic-usage.xml
(svn.tour.treeconflicts.example): Rework this section a bit for
clarity, for updated output from Subversion 1.7 binaries, and to
not depend on Subversion applying edits atop of moved file
automatically (since we removed that logic in Subversion 1.7).