A deep dive into git’s 3-way merge algorithm.