
Improve 'svn merge' callbacks.  Need to start writing some merge tests now.

* libsvn_client/diff.c (merge_file_deleted, merge_file_added,
  merge_dir_deleted, merge_dir_added, ): flesh out to deal with no-op
  cases and various error-conditions.







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

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