first commit in testing branch
added text to test.txt
added newline to testing.txt
Merge branch 'testing'

added newline
renamed testing.txt to test.txt
Merge branch 'testing'

Issued wrong command when adding text to testing.txt.
Also renamed testing.txt to test.txt