add feature a to jacky.txt
add feature bbb
Merge branch 'featureA'

Conflicts:
	jacky.txt
add ccc for jacky.txt
Merge branch 'featureA'
update jacky.txt on test branch
Update jacky.txt
ddd
iii
merget with test
Conflicts:
	jacky.txt
new
new masd
ii
iiiiiiii
Revert "iiiiiiii"
revert submit
This reverts commit 6288331143f43869aa0483885c86e07e9ff907ab.
test changed
iMerge branch 'test'

Conflicts:
	jacky.txt
add 2[4~
Merge branch 'test'
add 3