title: Local-only text segment is displayed outside markers in conflict file
body: <p>In a conflict resolution file generated by git, only common code should be displayed outside the markers ('&lt;&lt;&lt;&lt;&lt;&lt;&lt; ours' - '>>>>>>> theirs') - correct?!</p>
  
  <p>I have a CSS file with comments that I have inserted in the local version and a conflict occurred, and this comment segment is listed outside the markers. </p>
  
  <p>This occurs both in normal style and in diff3 style (base segments included).</p>
  
  <p>When using a visual tool (p4merge in my case), The said text segment is shown only in local, but not in base or remote. </p>
  
  <p>Also checked:</p>
  
  <pre><code>git checkout --theirs &lt;file-name&gt;
  --&gt; said segment not there
  
  git checkout --ours &lt;file-name&gt;
  --&gt; said segment there
  
  git checkout -m &lt;file-name&gt;
  --&gt; said segment outside markers
  </code></pre>
  
  <p>So what's going on?!</p>