Auto-resolve lines added before or after

[yairchu]

When clearly only one side had lines added before or after base, would it make sense to resolve the conflict automatically by just adding these lines before the other side?

I'm personally trying it out in with the added-lines branch which implements this behavior, will report if I stumble upon resulting unwelcome resolutions!