* doc/handbook/client.texi:   Update the description for the three fulltext filenames created when   a merge generates a conflict.
* doc/handbook/client.texi:
  Update the description for the three fulltext filenames created when
  a merge generates a conflict.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion