Update tree-conflict detection design document, treating files and dirs consistently.  A tree conflict victim should not be updated/merged.
Update tree-conflict detection design document, treating files and dirs
consistently.  A tree conflict victim should not be updated/merged.

 * notest/tree-conflicts/detection.txt
   Revise and simplify use cases.  Adapt supporting text to match.



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

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