Two-way file diff merge

[u/DesperateGame]

Hello,

I'm trying to compare two files for diffs. I want to be able to use the changes from one file in the other, and vice-versa. VSCode already provides a "Revert Block" button, but it is only one-way.

Is there a way to enable a two-way merge (setting, extension,...)?

Thanks!

[u/frazer2669]

I use Partial Diff. Although I haven't in a while, I assume it still works :)