* notes/tree-conflicts/detection.txt: Add some notes regarding handling    of directories as tree-conflict victims.
* notes/tree-conflicts/detection.txt: Add some notes regarding handling
   of directories as tree-conflict victims.

Review by: sbutler


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

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