e
<code>merge.conflictStyle</code> configuration variable.  Possible values are
"merge" (default) and "diff3" (in addition to what is shown by
"merge" style, shows the original contents).</p>
</dd>
<dt class="hdlist1">-p</dt>
<dt class="hdlist1">--patch</dt>
<dd>
<p>Interactively select hunks in the difference between the
<code>&lt;tree-ish&gt;</code> (or the index, if unspecified) and the working
tree.  The chosen hunks are then applied in reverse to the
working tree (and if a <code>&lt;tree-ish&gt;</code>