asf - Revision 1917486: /subversion/tags/1.5.0-rc2/notes/tree-conflicts