Version Control With Subversion Source

(svn.branchmerge.basicmerging.mergeinfo): Add a tip explaining
that "mergeinfo" is just shorthand for the svn:mergeinfo
property. We use this shorthand a bit in the book, but more
importantly it is used extensively everywhere else. Also
add "mergeinfo" to the index.