asf - Revision 1917532: /subversion/tags/1.5.0-rc10/notes/tree-conflicts