
Improvements to 'svn merge' callbacks.

* diff.c (merge_prop_changed): only store a property if it's a
  "regular" property.  By definition, 'svn merge' will never touch
  *anything* within the .svn/ area, which means igoring any wcprops or
  entry-props. 

  (merge_file_added): if trying to add a file that is under version
  control, examine *two* cases.  If already scheduled for deletion, go
  ahead and do a normal addition ((R)eplacement).  Otherwise, do a file merge.



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

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