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

* notes/tree-conflicts/detection.txt
  Corrections to use cases 1 and 2 and to the use case 1
  example. Update the intro and move redundant statements
  into the notes.

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

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