Review of FreeBSD's Subversion primer

new svn conflict resolver status update