ackport a patch, bails out because
the code the patch applies to has changed too much, and then tries
again, this time exercising more care about matching up context lines.</p>
</div>
<div class="listingblock">
<div class="content">
<pre>$ git cherry-pick topic^             <b class="conum">(1)</b>
$ git diff                           <b class="conum">(2)</b>
$ git cherry-pick --abort            <b class="conum">(3)</b>
$ git cherry-pick -Xpatience topic^  <b class="conum">(4)</b></pre>
</div>
</div>
<div c