branch test
ok
AND simple
& simple
conflict fixed
add merge
merge with no-ff
stash
fix bug 101
merged bug fix 101
.gitignore