Commit first branch for fast-forward merge
Commit 2nd file in second new branch

	This should NOT be a fast-forward merge
	it should create a merge commit
Merge branch 'new-2'
Add new-3 file for fast-forward merge
Add a new file 4 in new-4 branch
Merge branch 'new-4'
update new4 file
update file 4 on master branch
Merge branch 'new-4'

Conflicts:
	new-4-branch-test.txt
new in master branch
change 1
change 2
change 3
change 4