* subversion/libsvn_wc/props.h   (SVN__SUPPORT_BASE_MERGE): Track rename in comment.
* subversion/libsvn_wc/props.h
  (SVN__SUPPORT_BASE_MERGE): Track rename in comment.

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

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