asf - Revision 1917438: /subversion/tags/1.5.0-rc3/notes/tree-conflicts