Ooh, Beckett by #InkAndSwitch looks cool:

https://www.inkandswitch.com/project/beckett/

Visual diffs for merge conflicts in #GodotEngine ✨