asf - Revision 1917484: /subversion/tags/1.5.0-rc1/notes/tree-conflicts