SVN basic merging

http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html