DeltaView

DeltaView compares folders and files side by side and merges the
differences: copy changes across, resolve three-way merges, and
synchronize folders with a preview of every step.

It compares local folders, zip and tar archives and SFTP servers, shows
images (side by side, swipe, onion skin, pixel difference) and JSON, YAML
and CSV by their structure, and works as git difftool and mergetool.

Long lines wrap or scroll, unchanged runs fold away, syntax is
highlighted, and files keep their encoding and line endings when saved.
Themes, colour-blind-safe diff colours, fonts and every shortcut can be
changed in Settings.

Strict confinement: DeltaView can open files in your home folder and on
removable media, and connects to the SFTP servers you choose.