1-merge-ff
@ 5cbd705465
2-merge-no-ff
@ 4461ba6aeb
3-merge-dirty
@ 18f86e4aa2
4-rebase-no-conflict
@ cbf57a9a06
5-merge-conflict-easy
@ 7b759e5389
6-rebase-conflict-easy
@ 8befc09275
7-merge-conflict-hard
@ 0f527dec43
8-rebase-conflict-hard
@ 42d7cad46d