asf - Revision 1917840: /subversion/tags/1.9.6/notes/tree-conflicts

• ..
• all-add-vs-add-tree-conflicts.txt
• all-tests.sh
• design-overview.txt
• detection.txt
• requirements.txt
• resolution.txt
• scratch-pad.txt
• use-cases-resolution.txt
• use-cases.txt