Using Ubuntu 20.04 (Focal Fossa) I would like to use a graphical diff tool (like Meld, KDiff3, Kompare, etc.) that supports automatic line breaks. What I mean b
In Linux, my favorite merge tool is Meld, and I've had no problems using or configuring it to work with Git. However, in Windows it has been a different story.
I've specified merge-tool-cmd = meld in my Subversion config. When I go to resolve a merge conflict using option l from the presented conflict resolution option