* subversion/libsvn_wc/conflicts.c   (resolve_prop_conflict_on_node): Resolve variable shadowing by reading     the actual properties a bit earlier, and re-using the result.
* subversion/libsvn_wc/conflicts.c
  (resolve_prop_conflict_on_node): Resolve variable shadowing by reading
    the actual properties a bit earlier, and re-using the result.


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

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