title: Diff markup present in merged file
body: <p>In the Synchronize view, I right click the conflicted file then select <code>Edit Conflict</code>. Once I'm done merging the files, I right click the file and select <code>Mark Merged</code>.</p>
  
  <p>However, when I open the file in the PHP perspective, I still see the diff markers:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; .working
  ...
  ======= 
  </code></pre>
  
  <p>I then proceed to get rid of them before commiting my code. There has to be a better way... what am I doing wrong?</p>