In the documentation, there are a difference between the diagrams for the basic plan in the cheatsheet and in the general guide (Branching and Merging Guide.pdf)
The differences are a bit confusin...
Id #20915 | Release:
v3.2 - Version Control Guidance
| Updated: May 2, 2014 at 2:10 AM by wschaub | Created: Apr 11, 2014 at 11:38 AM by TomKise