Add another way to resolve merge conflicts with Meld#3109

Open

amiryal wants to merge 1 commit intojj-vcs:mainfrom amiryal:push-nkxtuozwnxln

+21

Commits on Feb 22, 2024

Expand the meld-3 tool experiment to editing file conflicts
amiryal
committed