* subversion/libsvn_client/resolved.c   (conflict_get_internal): Always add a legacy conflict for now so    all callers can assume it will be present and use it.
* subversion/libsvn_client/resolved.c
  (conflict_get_internal): Always add a legacy conflict for now so
   all callers can assume it will be present and use it.


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

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