Tech stuff

More to come…

For now:

I make a case that merges are not linebreak sensitive: Do three way merges care about linebreaks.