Try with Tag
commit in test branch
update code.txt from master
commit from master
Merge branch 'test'
change in Test_Delete folder.
from test delete folder
update merge.txt from test branch
update from master branch
commit from test branch
Merge branch 'master' into TestDel

Conflicts:
	Merge.txt
work on 2014/05/09