svn_wc_diff_callbacks2_t.dir_props_changed's 'original_props' parameter is an hash of 'char *' Vs 'svn_string_t *' *not* 'char *' Vs 'svn_prop_t *'.
svn_wc_diff_callbacks2_t.dir_props_changed's 'original_props' parameter
is an hash of 'char *' Vs 'svn_string_t *' *not*
'char *' Vs 'svn_prop_t *'.

* subversion/libsvn_client/merge.c
  (merge_props_changed): change type of 'mergeinfo_prop' to 'svn_string_t *'.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@874741 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion