* subversion/libsvn_client/resolved.c   (prop_conflicts): Allow 'base', 'mine-conflict', and 'theirs-conflict'    for property conflicts because libsvn_wc supports this.    At present, libsvn_wc treats 'mine-conflict' and 'theirs-conflict'    just like 'mine-full' and 'theirs-full'. For backwards compat we should    keep accepting them, and perhaps we'll decide to make 'mine-conflict'    and 'theirs-conflict' do something different in the future.
* subversion/libsvn_client/resolved.c
  (prop_conflicts): Allow 'base', 'mine-conflict', and 'theirs-conflict'
   for property conflicts because libsvn_wc supports this.
   At present, libsvn_wc treats 'mine-conflict' and 'theirs-conflict'
   just like 'mine-full' and 'theirs-full'. For backwards compat we should
   keep accepting them, and perhaps we'll decide to make 'mine-conflict'
   and 'theirs-conflict' do something different in the future.


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

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