 information.  (resolve-undo
information is what is used to implement "git checkout -m
$PATH", i.e. to recreate merge conflicts that were
accidentally resolved)</p>
</dd>
<dt class="hdlist1">-z</dt>
<dd>
<p>\0 line termination on output and do not quote filenames.
See OUTPUT below for more information.</p>
</dd>
<dt class="hdlist1">--deduplicate</dt>
<dd>
<p>When only filenames are shown, suppress duplicates that may
come from having multiple stages during a merge, or giving
<code>--deleted</code> and <code