title: SVN merge with renamed file results in tree conflict
body: <p>I created branch from my working copy. In it I renamed the file using <code>svn rename</code> and made some modifications to it. Then I commited the file which commited with status A, and the old file was scheduled for delete. My problem occured when I tried to merge that commit to my working copy. I've got tree conflict on merge. Tree conflict appeared on file which I renamed in branch. Where am I wrong?</p>