I've released difftastic 0.50! In this release: * Merge conflicts! Difftastic now understands <<<<<<< syntax and shows a syntactic diff of the underlying files. * Updated parsers for Elixir, Erlang, Go, Kotlin and Racket * Various styling quality-of-life improvements https://github.com/Wilfred/difftastic/releases/tag/0.50.0