Anyone know of a decent diff3 resolution tool? I have a file that has diff3 markers showing how two files diverge from a common base, but the sections that are marked as diverging are LOOOOONG and it's very unwieldy to view in Vim. It would be awesome if there's some sort of tool (GUI or CLI, I don't care) that would show me just the part of the file that is common to both "branches" in one pane, then show me where the diverging parts are and what their contents are in two additional panes (both separate from the main one), preferably with the ability to diff the two "versions" of the diverging file sections with each other. My Google-fu is failing me while hunting for a tool like this.
I may have to write something like this myself if it doesn't exist yet.
@arraybolt3 I don't know if it has the functionality you want, but have you tried Meld? https://flathub.org/apps/org.gnome.meld I think you might find it useful regardless. I find it very useful.
It does have a three-way comparison mode. Maybe there's a setting you can change. #GNOMEMeld
@golemwire @arraybolt3 Or maybe kdiff3? I've not tried it, though.