Add support for 3-ways diff (diff3) WIP