Corrections to the tree conflict detection design note.
Corrections to the tree conflict detection design note.

* notes/tree-conflicts/detection.txt
  Clarify use cases 1 and 2.  Correct a note in the example
  of a deep tree conflict.

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

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