Error in Merge Documentation

[flyingL123]

I believe there is a typo in the branching and merging documentation located here: http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

In the diagram labeled "A merge commit", shouldn't the commit that "Master" points to be labeled "C6", not "C5"?

[doingweb]

Looks like the content isn't up-to-date with the upstream https://github.com/progit/progit2. This has already been fixed over there, but hasn't made it to the site yet. See #515.

[pedrorijo91]

seems a similar problem to #472 @peff ?

[sxlijin]

Closed by #952 @peff