3 ms·

I use WinMerge for that, unfortunately, as the name implies, Windows only.

• ubercow13 2y ago
  I don't think WinMerge supports proper 3 way merge..