add 4.txt
test commit
--staged
dadsa
-a -m
delete 2
2
mv
add 3_rename.txt
mergertest1
test
caca
resolve merge conflict
add
llllllll
mergetools test success
2changed
hello
ooo
a yy