there is also diffuse merge tool, it's pretty good, it works on mac as well (I personally use it on fedora through flatpak)
there is also diffuse merge tool, it's pretty good, it works on mac as well (I personally use it on fedora through flatpak)