changed file2
Merge branch 'branch4'
changed masterfile
deleted files
changed masterfile
changed masterfile again
amend file2
amends file2
changed file2 again