asf - Revision 1916624: /subversion/branches/1.6.x-serf-1-win32/notes/tree-conflicts