file name changed
Added replacement for
previously deleted
file with a
multiline commit message
an edit
an edit again
Merge branch 'new-test', remote-tracking branch 'origin'