title: Tortoise SVN merge two branches
body: <p>i'm trying to merge two branches with tortoise SVN.
  Both branches have been changed since they diverged.
  If i merge them, only the changes of one of them obtain and those of the other will be overwritten.
  But i want the latest change of every file (We have not been working in the same files).</p>
  
  <p>I tried the option "Merge two different trees" and entered the two branches in "From:" and "To:".
  I took the Head Revision on both.
  I left everything else to default (Merge depth: Working Copy, Compare whitespaces, everything else unchecked)</p>