Difftastic now supports parsing files with conflict markers, enabling you to diff the two conflicting file states.
$ difft file_with_conflicts.js
Updated Elixir, Erlang, Go, Kotlin and Racket parsers.
Tweaked the colours on the file header, to make metadata less prominent.
Improved styling of file rename information.
Improved syntax hightling for Java built-in types.
Fixed an issue with runaway memory usage when the two files input files had a large number of differences.
Updates may require up to 24 hours to propagate to mirrors. If the following command doesn't work, please retry later:
sudo dnf upgrade --refresh --advisory=FEDORA-2023-2f4b90febfPlease log in to add feedback.
This update has been submitted for testing by salimma.
This update's test gating status has been changed to 'ignored'.
This update has been pushed to testing.
This update has been submitted for stable by bodhi.
This update has been pushed to stable.