testcheckout
append dev1
dev1.txt modify
master dev modify
conflict fixed
add merge
merge with no-ff
reconver bug
merge bug fix