the merge
should result in deletion of the path).</p>
</div>
<div class="paragraph">
<p>When checking out paths from the index, this option lets you recreate
the conflicted merge in the specified paths.</p>
</div>
<div class="paragraph">
<p>When switching branches with <code>--merge</code>, staged changes may be lost.</p>
</div>
</dd>
<dt class="hdlist1">--conflict=&lt;style&gt;</dt>
<dd>
<p>The same as <code>--merge</code> option above, but changes the way the
conflicting hunks are presented, overriding th