* subversion/libsvn_client/conflicts.c   (resolve_incoming_move_dir_merge): Handle the case where yca_loc is NULL.
* subversion/libsvn_client/conflicts.c
  (resolve_incoming_move_dir_merge): Handle the case where yca_loc is NULL.


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

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