test branche, add eee.txt
branch modify
mofity master
conflict fixed by ljh
mofity aaa.txt
merge with no-ff
modify bbb.txt add bbb
Merge branch 'dev'