<p dir="auto">When editing merge changes in the git control panel when you edit the stash vs. updated upstream changes, if you remove code in the updated/stash code then undo and redo the changes there will be a red/orange bar on the code line that you edited. After than line of code is in orange/red bar you can only remove it by closing the file and reopening it.</p>
<p dir="auto">Example:</p>
<div class="snippet-clipboard-content notranslate position-relative overflow-auto" data-snippet-clipboard-copy-content="var example = function () {
&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream           (this is a red/orange line)
    var updated;
=======                            (this is a red/orange line)
    var stashed;
&gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes            (this is a red/orange line)
}"><pre class="notranslate"><code class="notranslate">var example = function () {
&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream           (this is a red/orange line)
    var updated;
=======                            (this is a red/orange line)
    var stashed;
&gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes            (this is a red/orange line)
}
</code></pre></div>
<p dir="auto">Then remove the git stashed/updated lines:</p>
<div class="snippet-clipboard-content notranslate position-relative overflow-auto" data-snippet-clipboard-copy-content="var example = function () {
    var stashed;
}"><pre class="notranslate"><code class="notranslate">var example = function () {
    var stashed;
}
</code></pre></div>
<p dir="auto">Then undo the changes:</p>
<div class="snippet-clipboard-content notranslate position-relative overflow-auto" data-snippet-clipboard-copy-content="var example = function () {
&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream           (this is a red/orange line)
    var updated;
=======                            (this is a red/orange line)
    var stashed;
&gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes            (this is a red/orange line)
}"><pre class="notranslate"><code class="notranslate">var example = function () {
&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream           (this is a red/orange line)
    var updated;
=======                            (this is a red/orange line)
    var stashed;
&gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes            (this is a red/orange line)
}
</code></pre></div>
<p dir="auto">Then redo the changes, there will be a red/orange line:</p>
<div class="snippet-clipboard-content notranslate position-relative overflow-auto" data-snippet-clipboard-copy-content="var example = function () {        (this is a red/orange line)
    var stashed;
}"><pre class="notranslate"><code class="notranslate">var example = function () {        (this is a red/orange line)
    var stashed;
}
</code></pre></div>
<p dir="auto">Then the only way you can remove that red/orange line is to close the file you're editing and reopen it.</p>
<p dir="auto">Gif example:<br>
<a target="_blank" rel="noopener noreferrer nofollow" href="https://cloud.githubusercontent.com/assets/11418316/13313394/be9d3dd0-db5a-11e5-8b84-7741e2e42a5e.gif"><img src="https://cloud.githubusercontent.com/assets/11418316/13313394/be9d3dd0-db5a-11e5-8b84-7741e2e42a5e.gif" alt="vscode-bug-gif" 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>