title: Saving merges using KDiff3 with TortoiseSVN
body: <p>Wanting to use KDiff3 as my conflict resolution tool for TortoiseSVN I followed the instructions <a href="https://stackoverflow.com/a/200657/19977">here</a> and <a href="http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-settings.html#tsvn-dug-settings-progs" rel="nofollow noreferrer">here</a> to configure TortoiseSVN to use KDiff3. My merge tool settings in TortoiseSVN are thus:</p>
  
  <pre><code>C:\Program Files (x86)\KDiff3\kdiff3.exe %base %mine %theirs -o %merged --L1 %bname --L2 %yname --L3 %tname
  </code></pre>
  
  <p>When performing a merge a conflicts may be detected. If they are I hit the 'Edit Conflict'  button to launch KDiff3 and reconcile the merge conflicts. </p>
  
  <p>However, when I save my merge the result is saved to a temporary file in the .svn folders rather than within the actual working file <code>C:\projects\my-new-project\src\mvags1.mxml</code>. The temporary location can be seen in the KDiff3 output window as well.</p>
  
  <p><img src="https://i.stack.imgur.com/YxJWt.jpg" alt="enter image description here"></p>
  
  <p>Have I configured anything incorrectly or are my expectations for how KDiff3 works with TortoiseSVN incorrect?</p>
  
  <p>I am using TortoiseSVN 1.7.5 and KDiff3 0.9.96.</p>