asf - Revision 1916603: /subversion/branches/1.7.x-issue4554/notes/tree-conflicts