albfan
commented
7 years ago Allow a merge conflict resolution, where both sides don't have to be equal to center, but differences are deactivated when conflict is resolved, that way you can always check result and origin
Needs local file, remote file, base file, result file and allow to compare each one with others at any time
Just add another buffer and compare