ow information about unmerged files in the output, but do
not show any other tracked files (forces --stage, overrides
--cached).</p>
</dd>
<dt class="hdlist1">-k</dt>
<dt class="hdlist1">--killed</dt>
<dd>
<p>Show untracked files on the filesystem that need to be removed
due to file/directory conflicts for tracked files to be able to
be written to the filesystem.</p>
</dd>
<dt class="hdlist1">--resolve-undo</dt>
<dd>
<p>Show files having resolve-undo information in the index
together with their resolve-undo