* subversion/libsvn_wc/conflicts.c   (read_tree_conflict_desc): Compare reason to svn_wc_conflict_reason_t.
* subversion/libsvn_wc/conflicts.c
  (read_tree_conflict_desc): Compare reason to svn_wc_conflict_reason_t.


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

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