delete test.text again
delete dir of learngit
AND simple
& simple
conflict fixed and sample
branch manager
merge with no-ff
fix bug 101
merged bug fix 101
add bug branch coding
new branch: bug branch coding