ed
entries:</p>
</div>
<div class="literalblock">
<div class="content">
<pre>working index HEAD target         working index HEAD
----------------------------------------------------
 X       U     A    B     --soft  (disallowed)
                          --mixed  X       B     B
                          --hard   B       B     B
                          --merge  B       B     B
                          --keep  (disallowed)</pre>
</div>
</div>
<div class="literalblock">
<div class="content">
<pre>working 