commit merge test v1.0
commit merge test v1.1
commit merge test v1.2
commit merge test v1.3
commit merge test v1.4
merging complete
commit rebase v1.0
commit rebase v1.2
commit rebase v2.0
commit rebase v2.3
commit rebase v2.1
commit rebase v2.2