* subversion/libsvn_wc/props.c   (svn_wc__perform_props_merge): A follow-up to r1417926 and r1420742: I got     the initial fix the wrong way round.
* subversion/libsvn_wc/props.c
  (svn_wc__perform_props_merge): A follow-up to r1417926 and r1420742: I got
    the initial fix the wrong way round.

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

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