[PhilipRoman]

If I understand correctly, this is like normal Git three way diff except you don't need the full source of the original base?