iss01 modify
issue 01 modify 2.txt
hotfix one bug
hotfix modify after test
hotfix another one
Merge branch 'iss01'
add ddddd to 2.txt
dddd
Merge branch 'my-temporary-work'

Conflicts:
	2.txt