* subversion/libsvn_client/merge.c   (merge_file_changed): Move the property merge code to right before the text     merge code, to allow changing them in a single libsvn_wc call in my next     commit. Start providing proper left and right information to the property     merge function.
* subversion/libsvn_client/merge.c
  (merge_file_changed): Move the property merge code to right before the text
    merge code, to allow changing them in a single libsvn_wc call in my next
    commit. Start providing proper left and right information to the property
    merge function.


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

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