Comment by paul_h

Semantic merge. PlasticSCM had that a feature many years back