<div dir="ltr"><br /><div style="style">Hi Heikki,</div><div style="style"><br /></div><div style="style">I am getting
conflictsapplying version 22 of this patch to 9.4dev. Could you rebase?</div><div style="style"><br /></div><div
style="style">Doesanyone know of an easy way to apply an external patch through git, so I can get git-style merge
conflictmarkers, rather than getting patch's reject file?</div><div class="gmail_extra" style="style"><br
/>Cheers,</div><divclass="gmail_extra" style="style"><br /></div><div class="gmail_extra"
style="style">Jeff</div></div>