new one
new two
Merge branch 'two'
new two in one
merge two.txt in one and two.txt in two
new test.txt