asf - Revision 1917502: /subversion/tags/1.5.0-alpha1/notes/tree-conflicts