change
Delete example.html~
delete
delete example.html
Merge branch 'test-branch'
delete more.txt
Merge branch 'master' into test-branch