New add
added 2
save
added footer
added header
newa
something
header touched
no merge
added log.tst
fix
added footer
fix
added the footer
save
commit
this
thisi
rebase
hahah