* subversion/libsvn_wc/conflicts.c   (read_prop_conflicts): Correctly set the conflict 'action' and 'reason'.
* subversion/libsvn_wc/conflicts.c
  (read_prop_conflicts): Correctly set the conflict 'action' and 'reason'.

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

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