t
quit
add a new file copy
File is removed now
2file
a new file is removed
3file
remove 3rd file
4th file
xxx4th deleted
add a blank
branch 3
master
conflict fixed
add branch4
merge with no-ff
fix a bug 01
merged bug fix 01
Merge branch 'master' of github.com:HaoyuRay/TestGit