test braches
merge
all commit
master ingore test
Merge branch 'feature'

Conflicts:
	readme.txt
a
1
master cached
hah
merge by --on-ff mode
merge with no ff
a
aaaa
fix bug 101
fix bug101
branch dev other bugs
commited