* subversion/libsvn_client/conflicts.c   (resolve_merge_incoming_added_file_text_merge,    merge_incoming_added_file_replace): Fix order of svn_prop_diffs() params.
* subversion/libsvn_client/conflicts.c
  (resolve_merge_incoming_added_file_text_merge,
   merge_incoming_added_file_replace): Fix order of svn_prop_diffs() params.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion