* 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.)

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion