Here is a place for you to explain what helps people to decypher the
differences since the previous iteration in Range-diff (which is not
very easy to read).

?

Could you not mix the ours+theirs thing into the same step?  Either
make it a standalone patch to clean up before or after your main 2
patches, or leave it totally outside the series and send it after
this series settles.

Got it, I'll revert that change.


Harald