* notes/tree-conflicts/detection.txt: Remove the section explaining    why detecting tree conflicts during merge requires history.    It has been made obsolete by recent design discussions.    Further update descriptions of how we plan to detect use cases    4 and 6. Completely rewrite the section on use case 5, which    was still outdated wrt latest discussion.
* notes/tree-conflicts/detection.txt: Remove the section explaining
   why detecting tree conflicts during merge requires history.
   It has been made obsolete by recent design discussions.
   Further update descriptions of how we plan to detect use cases
   4 and 6. Completely rewrite the section on use case 5, which
   was still outdated wrt latest discussion.

Patch by: Stephen Butler <sbutler@elego.de>


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

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