* notes/merge-tracking.txt    Add possible merge tracking related bug in reporting property conflicts    on folders.
* notes/merge-tracking.txt
   Add possible merge tracking related bug in reporting property conflicts
   on folders.

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

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