In the interactive conflict resolver, implement handling of property conflicts in accordance with the (very poor) capabilities currently offered by the Subversion library. This also fixes the messed up property conflict prompt mentioned in the r1387602 commit message.
In the interactive conflict resolver, implement handling of property
conflicts in accordance with the (very poor) capabilities currently
offered by the Subversion library. This also fixes the messed up
property conflict prompt mentioned in the r1387602 commit message.

* subversion/svn/conflict-callbacks.c
  (handle_prop_conflict): Just show the .prej file we get from the
    library to the user, and offer postpone, mine-full, and theirs-full
    options, which apply to all properties. There isn't much else we
    can currently do. Document the current deficiencies in comments.


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

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