* subversion/libsvn_wc/wc_db.c   (svn_wc__db_read_conflicts): Set the 'merged_file' of a text conflict     description to an absolute path, rather than just a basename. Fixes     'diff-full' during 'svn resolve' for files residing in subdirectories.
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_read_conflicts): Set the 'merged_file' of a text conflict
    description to an absolute path, rather than just a basename. Fixes
    'diff-full' during 'svn resolve' for files residing in subdirectories.

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