Be less specific about conflict types that svn_wc_status3_t can detect. We will probably have more conflict tyepds in the future.
Be less specific about conflict types that svn_wc_status3_t can detect.
We will probably have more conflict tyepds in the future.

Bert said on IRC: 
1.7 will most likely have 4 or 5 conflict types. I think we need
obstructions to allow updates to continue behind all conflicts, and maybe
somebody gets to marking patch conflicts. 

* subversion/include/svn_wc.h
  (svn_wc_status3_t): Change doc comment for field 'conflicted'.

Suggested by: rhuijben

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion