* subversion/libsvn_wc/props.c   (maybe_generate_propconflict): Rename 'old_val' and 'new_val' to    'incoming_old_val' and 'incoming_new_val' for clarity.
* subversion/libsvn_wc/props.c
  (maybe_generate_propconflict): Rename 'old_val' and 'new_val' to
   'incoming_old_val' and 'incoming_new_val' for clarity.


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

YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion