I like using kdiff3, I also like using git, I also like using bundles for applications. Let’s put the three together!
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak remote-add --if-not-exists kdeapps --from https://distribute.kde.org/kdeapps.flatpakrepo flatpak install kdeapps org.kde.kdiff3
Write a tiny shim around this so we can use it from git. Put it in /usr/bin/kdiff3 or $HOME/bin/kdiff3 if $PATH is set up to include bins from $HOME.
#/bin/sh exec flatpak run org.kde.kdiff3 "$@"
Don’t forget to
chmod +x kdiff3 it!
git mergetool should now pick up our kdiff3 wrapper automatically. So all that’s left to do is having a merge conflict and off we go with