*The* Subversion Repository: svn - Revision 32295: /trunk/notes/tree-conflicts

• ..
• design-overview.txt
• detection.txt
• requirements.txt
• resolution.txt
• scratch-pad.txt
• use-cases.txt