<ul dir="auto">
<li>have a git conflict</li>
<li>click around if the line conflict decorations don't show up</li>
<li>delete the conflicting lines</li>
<li>undo</li>
<li>Observe: now the conflict decorations never disappear without a Reload window or a new model instantiation.</li>
</ul>
<p dir="auto"><a target="_blank" rel="noopener noreferrer nofollow" href="https://cloud.githubusercontent.com/assets/5047891/13222873/2c86c896-d982-11e5-9a3e-6d5636690a9f.gif"><img src="https://cloud.githubusercontent.com/assets/5047891/13222873/2c86c896-d982-11e5-9a3e-6d5636690a9f.gif" alt="git-conflict-decorations" data-animated-image="" style="max-width: 100%;"></a></p>
<p dir="auto">Ubuntu 12.04, vscode 0.10.1</p>
<p dir="auto">Deleting and undoing the line doubles the highlight: (stays after closing and reopening the file)</p>
<p dir="auto"><a target="_blank" rel="noopener noreferrer nofollow" href="https://cloud.githubusercontent.com/assets/2193314/11248144/728d1290-8dd4-11e5-843d-b1207570c8e0.png"><img src="https://cloud.githubusercontent.com/assets/2193314/11248144/728d1290-8dd4-11e5-843d-b1207570c8e0.png" alt="highlight1" style="max-width: 100%;"></a></p>
<p dir="auto">Deleting from the end of the line above the <code class="notranslate">=======</code> to the end of the line starting with <code class="notranslate">&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code>:</p>
<p dir="auto"><a target="_blank" rel="noopener noreferrer nofollow" href="https://cloud.githubusercontent.com/assets/2193314/11248233/e578f95e-8dd4-11e5-92a9-603361d90e59.png"><img src="https://cloud.githubusercontent.com/assets/2193314/11248233/e578f95e-8dd4-11e5-92a9-603361d90e59.png" alt="highlight3" style="max-width: 100%;"></a></p>
<p dir="auto">Undoing the above results in this:</p>
<p dir="auto"><a target="_blank" rel="noopener noreferrer nofollow" href="https://cloud.githubusercontent.com/assets/2193314/11248196/ad1667fe-8dd4-11e5-989b-0fe74bb599d1.png"><img src="https://cloud.githubusercontent.com/assets/2193314/11248196/ad1667fe-8dd4-11e5-989b-0fe74bb599d1.png" alt="highlight2" style="max-width: 100%;"></a></p>