test-forward merge
three-way merge
test fast-forward merge
change in master
change in testing
Merge branch 'testing'