asf - Revision 1917549: /subversion/branches/dav-path-escape/notes/tree-conflicts