@janriemer@mastodon.technology @friend Not spam at all!
Thanks, I'd not seen that, and it looks really well suited to my needs :)
miniblog.
Related Posts
Difftastic 0.67 is released!
* Added support for protobuf, improved bash and YAML.
* Updated 16 parsers to the latest upstream version (thanks Antonin Delpeuch!)
* A ton of display polish for word highlighting, alignment, and binary files.
@aburka Thanks for the feedback!
Definitely agreed on ours vs theirs, it's really confusing. Unfortunately I'm limited to how the sides are named in the file.
I like the diff3 conflictStyle in git, as it shows the base as well as both sides. I can't guarantee that the base is visible though, and it gives me three files to diff rather than two. Not sure about this case yet.
I've released difftastic 0.37!
* Improved performance, both runtime and memory usage (thanks to QuarticCat)
* Added --context=N to adjust how many contextual lines are shown
* Better Swift support
* The manual is now available in Chinese





