Linux

Meld

Caja extension

Caja (MATE desktop):

https://www.giuspen.com/nautilus-pyextensions/

Put here:

/home/mih/.local/share/caja-python/extensions

After changes:

killall caja

Windows

Meld

http://meldmerge.org/
https://sourceforge.net/projects/diff-ext/files/Binaries/1.9.1/