* 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: https://svn.apache.org/repos/asf/subversion/trunk@1480664 13f79535-47bb-0310-9956-ffa450edef68