niubi.txt
add niubi test
file of mabi commit by  master
gg
by gg
merge gg
modify by master
18
resolve conflict between stash0 and statsh1
deal
yyy