> James pointed out mistakes in this diff on IRC.
> It is possible to stack single-parent commits on top of merge commits
> which breaks the logic I implemented in my first patch.
> 
> Here is a better version.

Works for me; thanks!

-- 
James