* trunk/contrib/client-side/svn-merge-vendor.py:   Fix a log message (it was in a wrong order)   Now supporting the "replaced" and "normal" status of files
* trunk/contrib/client-side/svn-merge-vendor.py:
  Fix a log message (it was in a wrong order)
  Now supporting the "replaced" and "normal" status of files

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

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