test: add file 2
test: added file1 to test2 branch
test: added and edited file one to branch master
test: add file4 to master
Merge branch 'jim/test1'

Conflicts:
	file1
Merge branch 'jim/test1' into jim/test2

Conflicts:
	file1
Merge branch 'jim/test2'

Conflicts:
	file1
	file1.orig
test: remove .orig files
test: remove .orig files
Merge branch 'jim/test2'
Merge branch 'jim/test1'
Added file 6
Merge branch 'jim/test2'
test: added file 7 to branch 3
test: Amended file 7 on branch test 3
test: Added file 8 in branch 4
test: edit file 8
Added file 8 on branch test 4
Merge branch 'master' into jim/test4
edit to file 8 on branch test4