MarkLodato/visual-git-guide — pull request #16 by instanceof (2012-08-24 00:58:54+00:00)
Title: Update to correct the text for the real merge parent identifier

The "real" merge diagram shows the result of the three-way-merge is a new parent commit:

Otherwise, a "real" merge must occur. You can choose other strategies, but the default is to perform a "recursive" merge, which basically takes the current commit (ed489 below), the other commit (33104), and their common ancestor (b325c), and performs a three-way merge. The result is saved to the working directory and the stage, and then a commit occurs, with an extra parent (33104) for the new commit.

I think it should reference the new commit identifier as f8bc5...

Otherwise, a "real" merge must occur. You can choose other strategies, but the default is to perform a "recursive" merge, which basically takes the current commit (ed489 below), the other commit (33104), and their common ancestor (b325c), and performs a three-way merge. The result is saved to the working directory and the stage, and then a commit occurs, with an extra parent (f8bc5) for the new commit.