* notes/tree-conflicts/detection.txt: Cover results of further design    discussion between Julian Foad, Stephen Butler, Nico Schellingerhout,    C. Michael Pilato, and myself. We have gotten much closer to a solid    design for detection of the "merge" use cases (UC 4, 5, and 6).
* notes/tree-conflicts/detection.txt: Cover results of further design
   discussion between Julian Foad, Stephen Butler, Nico Schellingerhout,
   C. Michael Pilato, and myself. We have gotten much closer to a solid
   design for detection of the "merge" use cases (UC 4, 5, and 6).

Patch by: Julian Foad <julianfoad@btopenworld.com>
(Based on a patch by me, and tweaked by me: removed a remark
I introduced in the patch that Julian's patch was based on.)


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

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