#266 1.8 change: new internal merge tool

[bahrep]

It appears that SVNBook 1.8 is missing the info about the internal (built-in) interactive merge / conflict resolution tool: http://subversion.apache.org/docs/release-notes/1.8.html#file-merge-tool

Oops, mistakenly created the ticket using another SF account.