Create Branch1
Create Branch1
del 1
echo 'Create Branch1';
echo 'Create Branch1';
test2
Test Branch1
Create Branch2
test Branch1
echo 'Test Branch1';
	echo 'Test Branch2';
	echo 'Test Branch2';
vv
tt
Merge branch 'Branch1'

Conflicts:
	test.php
Merge branch 'Branch2'

Conflicts:
	test.php
del
e
tt