title: Tortoise SVN - Resolve Conflict, add both?
body: <p>A lot of times it happened, that multiple developers replaced the same line of code (one in branch, one in trunk for example), which resulted a conflict (when we did a branch->trunk merge). In these situations, the merge tool offers me to take either theirs, or mine. However, I want TortoiseSVN to take both, and put them under each other. Till now, what I was doing is that I accepted one, and manually copy-pasted the other one under it.</p>
  
  <p>Is there a built-in solution for this situation? </p>