> It gets a little weird with merge commits, but maybe you just say it’s stored as a diff from the first parent of the merge. Depending on the specific operati

> It gets a little weird with merge commits, but maybe you just say it’s stored as a diff from the first parent of the merge. Depending on the specific operation it can act like a diff from any of the parents (though the first is special) or all of them; it's (typically, and the way operations treat it) the result of a three-way merge using the parents and the most recent common ancestor found via graph walking, eliding some complexity. To the author, refer back to your earlier post about three-way merging in this section, perhaps?