test local branch
add it from new branch
add readme.txt
add it from dev branch
ffff
f
Merge branch 'new_branch' into dev_branch
dd
Conflicts:
	testlocalbranch.c
modify it from dev_branch
modify it from new branch
Merge branch 'dev_branch' into new_branch
commit it via -a
Conflicts:
	readme.txt
delete all
Merge branch 'new_branch' into dev_branch
commit -a
Conflicts:
	readme.txt
delete readme.txt