A semantic merge tool that understands your code (semanticmerge.com)

xxx

Reminds me of spatch: https://github.com/facebook/pfff/wiki/Spatch