branch test
Test branch merge
added in master
delete branch for merge
branch commit
modify readme.txt in master
Merge branch 'brancht2'
Cleared work dir
Create readme.txt
modified readme.txt
modified readme.txt in master
Resolved conflicts for merge