test commit new file on branch
test modified
test file modified again
test file modified again
test add to branch nr 2
committed test changes
branch 3 test add
edit on branch 3
Merge branch 'branch2' into branch1
Merge branch 'branch3' into branch1
Merge branch 'master' into branch1
edit on master
edit alternate branch
edit alternate branch again
edit alternate branch edit again 1
edit alternate branch edit again 1 2
edit alternate branch edit again 1 2 3
edit on branch 1: 9 edit
edit branch 1 with conflict
Merge branch 'branch1' into alternateBranch

Conflicts:
	masterFileTest.txt