AND simple
& simple
conflict fixed
branch
chongtu
git log --graph
none
add merger
merge with no-ff
dev