I am working on AST level revision control and yes, macros make life difficult. On the other hand, merging/diffing on the AST level is fun.
But I believe smalltalk represented code as functions in a database somehow, so maybe that is worth looking at.
Try your mobile browser’s reader view mode.
Smalltalk is ancient. I would say, Unison is an interesting recent experiment, and there are others. But, I am interested in universal revision control, any language.