init hello
branch1 commit
1
2
Merge branch 'branch1'

Conflicts:
	branch1
master1
ddddd
init list
deal1 commit
add list
add hello
add ddd
Merge branch 'deallist'
test1111
Squashed commit of the following:

    add deal5
    add deal4
    add deal3
add deal4

Conflicts:
	list
add ggg
add zzz
add deal4

Conflicts:
	list

Conflicts:
	list
add deal4

Conflicts:
	list

Conflicts:
	list
4
3
2
1