Create extrafoo.txt
Add line to bla.txt
Add third line
Merged (partially by hand)
Merge branch 'extrabranch'