add 2 files
move access file
modified index
test1
test2
modify
modify test
test4
branch dev c.txt
 test branch 1
test c.txt
 merge test and resolve conflicts
master commit d.txt
branch dev ci e.txt
Merge branch 'dev'
dev ci f.txt
test no-ff
edit c
stash test
Merge branch 'master' of github.com:leev5/learn