* subversion/svn/conflict-callbacks.c   (handle_prop_conflict): Don't allow 'r' to be used if no merged property    value exists yet. Fix indentation while here. 
* subversion/svn/conflict-callbacks.c
  (handle_prop_conflict): Don't allow 'r' to be used if no merged property
   value exists yet. Fix indentation while here. 


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

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