title: How can KDiff3 be used properly with TortoiseSVN to resolve conflicts?
body: <p>I have TortoiseSVN set up to use KDiff3 as the conflict resolution tool (I find it shows more information useful to the merge than the built-in TortoiseMerge does).</p>
  
  <p>When I open a file with Tortoise's "Edit Conflicts" command it shows me the three files and I have to select "Merge->Merge Current File" manually. The problem is that KDiff3 saves the result to <code>source_file.working</code> instead of to <code>source_file</code>. So without doing a Save As, the real file with the conflict doesn't get modified. Is there a way around doing this manual Save As every time?</p>
  
  <p>I know this isn't strictly a programming question but it's about an ancillary process common enough to programmers that it should be useful here. I couldn't find the answer to this elsewhere.</p>