Comment by xcjs

Did they ever get around to three-way merges? That's a must-have if you use Git as a VCS.