* subversion/libsvn_wc/wc_db.c   (svn_wc__db_temp_op_set_text_conflict_marker_files): Fix offset.   (svn_wc__db_temp_op_set_property_conflict_marker_file): Fix setting     parent_relpath to NULL on a working copy root.
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_temp_op_set_text_conflict_marker_files): Fix offset.
  (svn_wc__db_temp_op_set_property_conflict_marker_file): Fix setting
    parent_relpath to NULL on a working copy root.

Found by: Lunch

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