title: kdiff3 merge does not work
body: <p>While using <a href="http://kdiff3.sourceforge.net/" rel="noreferrer">KDiff3</a> to resolve merge conflicts, how do I save the resolved copy of the <strong>A</strong> and <strong>B</strong> versions?</p>
  
  <p>I open <a href="http://kdiff3.sourceforge.net/" rel="noreferrer">KDiff3</a> to resolve merge conflicts. I am able to resolve each conflict by selecting the desired version. When I have resolved all of the conflicts, I click the <code>merge</code> button. Then I try to save, but a prompt appears saying that there merge conflicts are still present.</p>